Merge master.kernel.org:/home/rmk/linux-2.6-arm

2005-10-26 14:01:57 -07:00
parent 70ab81c2ed 7edc24c4d1
commit dd41bf9166
2 changed files with 2 additions and 1 deletions
@@ -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; }) )