diff --git a/[refs] b/[refs]
index d84999475f47..b41c0688a6f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9110540f7f2bbcc3577d2580a696fbb7af68c892
+refs/heads/master: 6b53f7870d1657831df23788d1984aac3b5a97bd
diff --git a/trunk/sound/oss/cmpci.c b/trunk/sound/oss/cmpci.c
index 1fbd5137f6d7..de60a059ff5f 100644
--- a/trunk/sound/oss/cmpci.c
+++ b/trunk/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;