git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sound: oss: rename local change_bits to avoid powerpc bitsops.h definition
[pandora-kernel.git]
/
sound
/
oss
/
sb_mixer.c
diff --git
a/sound/oss/sb_mixer.c
b/sound/oss/sb_mixer.c
index
2039d31
..
f8f3b7a
100644
(file)
--- 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;
}
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;
{
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);
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
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
*/
}
* 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);
sb_setmixer(devc, regoffs, val);