diff options
author | Andy Whitcroft <apw@canonical.com> | 2011-07-27 17:48:41 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-27 19:16:05 +0200 |
commit | 8d34e6d3ec0393a286569587fbd9675abd258d93 (patch) | |
tree | a9cc1ef4024ff96a93b0c0f2013d0d604a7b9177 /sound/oss/ad1848.c | |
parent | c48a8fb0d31d6147d8d76b8e2ad7f51a2fbb5c4d (diff) |
sound: oss: rename local change_bits to avoid powerpc bitsops.h definition
This collides with powerpc exported functions from bitops.h. Rename the
local copy in the oss soundblaster mixer and ad1848 driver.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/ad1848.c')
-rw-r--r-- | sound/oss/ad1848.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 4d2a6ae978f..8a197fd3c57 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -458,7 +458,7 @@ static int ad1848_set_recmask(ad1848_info * devc, int mask) return mask; } -static void change_bits(ad1848_info * devc, unsigned char *regval, +static void oss_change_bits(ad1848_info *devc, unsigned char *regval, unsigned char *muteval, int dev, int chn, int newval) { unsigned char mask; @@ -516,10 +516,10 @@ static void ad1848_mixer_set_channel(ad1848_info *devc, int dev, int value, int if (muteregoffs != regoffs) { muteval = ad_read(devc, muteregoffs); - change_bits(devc, &val, &muteval, dev, channel, value); + oss_change_bits(devc, &val, &muteval, dev, channel, value); } else - change_bits(devc, &val, &val, dev, channel, value); + oss_change_bits(devc, &val, &val, dev, channel, value); spin_lock_irqsave(&devc->lock,flags); ad_write(devc, regoffs, val); |