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://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[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
02b47a6
..
545776e
100644
(file)
--- a/
arch/x86/include/asm/bitops.h
+++ b/
arch/x86/include/asm/bitops.h
@@
-444,7
+444,9
@@
static inline int fls(int x)
#define ARCH_HAS_FAST_MULTIPLIER 1
-#include <asm-generic/bitops/hweight.h>
+#include <asm/arch_hweight.h>
+
+#include <asm-generic/bitops/const_hweight.h>
#endif /* __KERNEL__ */