summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNicolas Pitre <nico@org.rmk.(none)>2004-11-11 22:21:58 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2004-11-11 22:21:58 +0000
commit491c6040b07e484fd08aea09860f0cfa787c8d7b (patch)
treeb5f2a810cf4375aee07611c99bdb6fbeec520c6d /include
parent7303625c5f36f9dec5bdfc74b5878f7c3b9ff501 (diff)
[ARM PATCH] 2230/1: fix generic_fls declaration mismatch
Patch from Nicolas Pitre The declaration of generic_fls recently changed from extern inline to static inline. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/bitops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 994e0aeffd5b..ce923ee18276 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -342,7 +342,7 @@ static inline unsigned long __ffs(unsigned long word)
* the clz instruction for much better code efficiency.
*/
-extern __inline__ int generic_fls(int x);
+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; }) )