git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
bitops.h
diff --git
a/arch/x86/include/asm/bitops.h
b/arch/x86/include/asm/bitops.h
index
bafd80d
..
903683b
100644
(file)
--- a/
arch/x86/include/asm/bitops.h
+++ b/
arch/x86/include/asm/bitops.h
@@
-440,6
+440,8
@@
static inline int fls(int x)
#ifdef __KERNEL__
+#include <asm-generic/bitops/find.h>
+
#include <asm-generic/bitops/sched.h>
#define ARCH_HAS_FAST_MULTIPLIER 1