diff --git a/[refs] b/[refs]
index 2a905ae80229..ac80e0319d19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c34e152a494c0de8d920b70163d95235a51f4120
+refs/heads/master: 7edc24c4d1924e79d3853a8d7563bcce73f31e5d
diff --git a/trunk/include/asm-arm/bitops.h b/trunk/include/asm-arm/bitops.h
index aad7aad026b3..e007dd990da5 100644
--- a/trunk/include/asm-arm/bitops.h
+++ b/trunk/include/asm-arm/bitops.h
@@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word)
  * the clz instruction for much better code efficiency.
  */
 
-static __inline__ int generic_fls(int x);
 #define fls(x) \
 	( __builtin_constant_p(x) ? generic_fls(x) : \
 	  ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) )