From: Alexey Dobriyan dvb/frontends/at76c651.c: redefinition of __ilog2 blah blah (akpm: I nuked __ilog2 and used the standard long_log2() instead) Signed-off-by: Alexey Dobriyan Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton --- drivers/media/dvb/frontends/at76c651.c | 17 +---------------- 1 files changed, 1 insertion(+), 16 deletions(-) diff -puN drivers/media/dvb/frontends/at76c651.c~at76c651-dont-do-generic-__ilog2-on-mips drivers/media/dvb/frontends/at76c651.c --- 25/drivers/media/dvb/frontends/at76c651.c~at76c651-dont-do-generic-__ilog2-on-mips Fri Jan 27 13:56:41 2006 +++ 25-akpm/drivers/media/dvb/frontends/at76c651.c Fri Jan 27 13:58:12 2006 @@ -61,21 +61,6 @@ static int debug; } while (0) -#if ! defined(__powerpc__) -static __inline__ int __ilog2(unsigned long x) -{ - int i; - - if (x == 0) - return -1; - - for (i = 0; x != 0; i++) - x >>= 1; - - return i - 1; -} -#endif - static int at76c651_writereg(struct at76c651_state* state, u8 reg, u8 data) { int ret; @@ -183,7 +168,7 @@ static int at76c651_set_symbol_rate(stru * mantissa = (symbol_rate / FREF) * (1 << (30 - exponent)) */ - exponent = __ilog2((symbol_rate << 4) / 903125); + exponent = long_log2((symbol_rate << 4) / 903125); mantissa = ((symbol_rate / 3125) * (1 << (24 - exponent))) / 289; at76c651_writereg(state, 0x00, mantissa >> 13); _