Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[karo-tx-linux.git] / include / asm-xtensa / bitops.h

diff --git a/include/asm-xtensa/bitops.h b/include/asm-xtensa/bitops.h
index e76ee889e21dadf98702fdc1756b540752b1b355..0a2065f1a372dc8619bfa3cbc6924b7b0c8fb2b2 100644 (file)
--- a/include/asm-xtensa/bitops.h
+++ b/include/asm-xtensa/bitops.h
@@ -245,6 +245,7 @@ static __inline__ int fls (unsigned int x)
 {
        return __cntlz(x);
 }
+#define fls64(x)   generic_fls64(x)
 
 static __inline__ int
 find_next_bit(const unsigned long *addr, int size, int offset)