From 2d20abbbcc1bfa2a10a43080310f17f7436b6d08 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 1 Jan 2009 10:12:18 +1030
Subject: [PATCH] --- yaml --- r: 125686 b: refs/heads/master c:
 0db5d3d2f58804edb394e8008c7d9744110338a2 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/m68knommu/include/asm/bitops.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7ed9c9d686e2..388ea0b5718b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 434ae514c23047db87a8bbf39cebc9e1767aea44
+refs/heads/master: 0db5d3d2f58804edb394e8008c7d9744110338a2
diff --git a/trunk/arch/m68knommu/include/asm/bitops.h b/trunk/arch/m68knommu/include/asm/bitops.h
index 6f3685eab44c..9d3cbe5fad1e 100644
--- a/trunk/arch/m68knommu/include/asm/bitops.h
+++ b/trunk/arch/m68knommu/include/asm/bitops.h
@@ -331,6 +331,7 @@ static __inline__ unsigned long ext2_find_next_zero_bit(void *addr, unsigned lon
 #endif /* __KERNEL__ */
 
 #include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
 #include <asm-generic/bitops/fls64.h>
 
 #endif /* _M68KNOMMU_BITOPS_H */