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

[~andy/linux] / include / asm-m68knommu / bitops.h

diff --git a/include/asm-m68knommu/bitops.h b/include/asm-m68knommu/bitops.h
index c42f88a9b9f986d25b3f859d38b9f3794ff17378..4058dd086a029d8a16515f6933fb65eb69ceab90 100644 (file)
--- a/include/asm-m68knommu/bitops.h
+++ b/include/asm-m68knommu/bitops.h
@@ -499,5 +499,6 @@ found_middle:
  * fls: find last bit set.
  */
 #define fls(x) generic_fls(x)
+#define fls64(x)   generic_fls64(x)
 
 #endif /* _M68KNOMMU_BITOPS_H */