oss/sonicvibes.c defines its own hweight32

[Richard Knutsson <ricknu-0@student.ltu.se>]

Hi Andrew and all

Just tried to compile the kernel with the 'allyesconfig' when I stumbled 
on this one (have not seen any reports on this one, otherwise sorry for 
the blotter):

  CHK     usr/initramfs_list
  CC      sound/oss/sonicvibes.o
sound/oss/sonicvibes.c:421: error: static declaration of ‘hweight32’ follows non-static declaration
include/asm-generic/bitops/hweight.h:6: error: previous declaration of ‘hweight32’ was here
make[2]: *** [sound/oss/sonicvibes.o] Error 1
make[1]: *** [sound/oss] Error 2
make: *** [sound] Error 2


I am not sure why it tries to make its own hweight32() so I just 
disabled it:

--- a/sound/oss/sonicvibes.c	2006-02-24 23:14:11.000000000 +0100
+++ b/sound/oss/sonicvibes.c	2006-02-25 04:10:09.000000000 +0100
@@ -408,6 +408,7 @@ static inline unsigned ld2(unsigned int 
 	return r;
 }
 
+#if 0
 /*
  * hweightN: returns the hamming weight (i.e. the number
  * of bits set) of a N-bit word
@@ -425,6 +426,7 @@ static inline unsigned int hweight32(uns
         res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF);
         return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);
 }
+#endif
 
 /* --------------------------------------------------------------------- */
 


BTW, I do not have the hardware, so it is just building-tested.

Best
Richard Knutsson