diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-26 23:01:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-26 23:01:57 +0200 |
| commit | dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07 (patch) | |
| tree | f6e112d029e3c36c0b14bda77c6b315e1e340e8b /include | |
| parent | posix cpu timers: fix timer ordering (diff) | |
| parent | [ARM] 3032/1: sparse: complains about generic_fls() prototype in asm-arm/bito... (diff) | |
| download | linux-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.tar.xz linux-dd41bf916609ae9d2d3ffbb56cfe0a6edd7d1e07.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/bitops.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h index aad7aad026b3..e007dd990da5 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; }) ) |