Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / arch / xtensa / include / asm / bitops.h

diff --git a/arch/xtensa/include/asm/bitops.h b/arch/xtensa/include/asm/bitops.h
index 3f44fa2a53e9fcde4266717bd245d15c0b530559..d3490189792b08a22962d9784c40472eaf5907b4 100644 (file)
--- a/arch/xtensa/include/asm/bitops.h
+++ b/arch/xtensa/include/asm/bitops.h
@@ -48,7 +48,7 @@ static inline int ffz(unsigned long x)
  * __ffs: Find first bit set in word. Return 0 for bit 0
  */
 
-static inline int __ffs(unsigned long x)
+static inline unsigned long __ffs(unsigned long x)
 {
        return 31 - __cntlz(x & -x);
 }