aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-26 01:38:56 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 08:57:09 -0800
commit6b53f7870d1657831df23788d1984aac3b5a97bd (patch)
tree9392fb65aed9a693e6eacc70d2ccd05e3cff7d8a
parent9110540f7f2bbcc3577d2580a696fbb7af68c892 (diff)
downloadlinux-2.6.34-ux500-6b53f7870d1657831df23788d1984aac3b5a97bd.tar.gz
[PATCH] cmpci: don't use generic_hweight32()
It's about to go away. Cc: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--sound/oss/cmpci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 1fbd5137f6d..de60a059ff5 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -1713,7 +1713,7 @@ static int mixer_ioctl(struct cm_state *s, unsigned int cmd, unsigned long arg)
case SOUND_MIXER_RECSRC: /* Arg contains a bit for each recording source */
if (get_user(val, p))
return -EFAULT;
- i = generic_hweight32(val);
+ i = hweight32(val);
for (j = i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
if (!(val & (1 << i)))
continue;