summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-26 14:01:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-26 14:01:57 -0700
commitdd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07 (patch)
treef6e112d029e3c36c0b14bda77c6b315e1e340e8b /include
parent70ab81c2ed3d1323e7d6805bf59cbb570dff7937 (diff)
parent7edc24c4d1924e79d3853a8d7563bcce73f31e5d (diff)
downloadop-kernel-dev-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.zip
op-kernel-dev-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/bitops.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index aad7aad..e007dd9 100644
--- a/include/asm-arm/bitops.h
+++ b/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; }) )
OpenPOWER on IntegriCloud