diff --git a/[refs] b/[refs]
index 4065053190d4..9aff5adf66b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93635133663ea3155e74a0e3645b64754a046007
+refs/heads/master: 20548664aa2d98ba0ee3dde4482b0a96b9273b6f
diff --git a/trunk/sound/oss/sonicvibes.c b/trunk/sound/oss/sonicvibes.c
index 69a4b8778b51..4471757b7985 100644
--- a/trunk/sound/oss/sonicvibes.c
+++ b/trunk/sound/oss/sonicvibes.c
@@ -407,24 +407,6 @@ static inline unsigned ld2(unsigned int x)
 	return r;
 }
 
-/*
- * hweightN: returns the hamming weight (i.e. the number
- * of bits set) of a N-bit word
- */
-
-#ifdef hweight32
-#undef hweight32
-#endif
-
-static inline unsigned int hweight32(unsigned int w)
-{
-        unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555);
-        res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
-        res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F);
-        res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF);
-        return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);
-}
-
 /* --------------------------------------------------------------------- */
 
 /*