X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fbitops.h;h=48f87b979ca9868abb4445a909036526f021158d;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=053d6e46bb9938b5936f0c819b4217cd35fe0819;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/linux/bitops.h b/include/linux/bitops.h
index 053d6e46b..48f87b979 100644
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
@@ -1,7 +1,6 @@
 #ifndef _LINUX_BITOPS_H
 #define _LINUX_BITOPS_H
 #include <asm/types.h>
-#include <asm/bitops.h>
 
 /*
  * ffs: find first bit set. This is defined the same way as
@@ -42,7 +41,7 @@ static inline int generic_ffs(int x)
  * fls: find last bit set.
  */
 
-extern __inline__ int generic_fls(int x)
+static __inline__ int generic_fls(int x)
 {
 	int r = 32;
 
@@ -71,7 +70,13 @@ extern __inline__ int generic_fls(int x)
 	return r;
 }
 
-extern __inline__ int get_bitmask_order(unsigned int count)
+/*
+ * Include this here because some architectures need generic_ffs/fls in
+ * scope
+ */
+#include <asm/bitops.h>
+
+static __inline__ int get_bitmask_order(unsigned int count)
 {
 	int order;