summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-01-01 10:12:18 +1030
committerRusty Russell <rusty@rustcorp.com.au>2009-01-01 10:12:18 +1030
commit0db5d3d2f58804edb394e8008c7d9744110338a2 (patch)
tree7528110d1e7c979bfff709dc0b37b7af596939f3 /arch/m68knommu
parent434ae514c23047db87a8bbf39cebc9e1767aea44 (diff)
downloadblackbird-op-linux-0db5d3d2f58804edb394e8008c7d9744110338a2.tar.gz
blackbird-op-linux-0db5d3d2f58804edb394e8008c7d9744110338a2.zip
m68knommu: define __fls
Like fls, but can't be handed 0 and returns the bit number. (I broke this arch in linux-next by using __fls in generic code). Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/include/asm/bitops.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/bitops.h b/arch/m68knommu/include/asm/bitops.h
index 6f3685eab44c..9d3cbe5fad1e 100644
--- a/arch/m68knommu/include/asm/bitops.h
+++ b/arch/m68knommu/include/asm/bitops.h
@@ -331,6 +331,7 @@ found_middle:
#endif /* __KERNEL__ */
#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h>
#endif /* _M68KNOMMU_BITOPS_H */
OpenPOWER on IntegriCloud