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/sb_mixer.c | |
parent | c48a8fb0d31d6147d8d76b8e2ad7f51a2fbb5c4d (diff) | |
download | linux-8d34e6d3ec0393a286569587fbd9675abd258d93.tar.gz linux-8d34e6d3ec0393a286569587fbd9675abd258d93.tar.bz2 linux-8d34e6d3ec0393a286569587fbd9675abd258d93.zip |
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/sb_mixer.c')
-rw-r--r-- | sound/oss/sb_mixer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c index 2039d31b7e22..f8f3b7a66b73 100644 --- a/sound/oss/sb_mixer.c +++ b/sound/oss/sb_mixer.c @@ -232,7 +232,7 @@ static int detect_mixer(sb_devc * devc) return 1; } -static void change_bits(sb_devc * devc, unsigned char *regval, int dev, int chn, int newval) +static void oss_change_bits(sb_devc *devc, unsigned char *regval, int dev, int chn, int newval) { unsigned char mask; int shift; @@ -284,7 +284,7 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right) return -EINVAL; val = sb_getmixer(devc, regoffs); - change_bits(devc, &val, dev, LEFT_CHN, left); + oss_change_bits(devc, &val, dev, LEFT_CHN, left); if ((*devc->iomap)[dev][RIGHT_CHN].regno != regoffs) /* * Change register @@ -304,7 +304,7 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right) * Read the new one */ } - change_bits(devc, &val, dev, RIGHT_CHN, right); + oss_change_bits(devc, &val, dev, RIGHT_CHN, right); sb_setmixer(devc, regoffs, val); |