summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-03 18:54:51 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-03 18:54:51 +0100
commite465b535ce5b2318798c68e1454917204494bfe3 (patch)
tree7cd7af9813a1fe2bfb04f9edd149e0f152b6cb1d /arch
parent7eb19553369c46cc1fa64caf120cbcab1b597f7c (diff)
parent5ece5c5192d065c229da01e7b347c1d3877b59fa (diff)
downloadop-kernel-dev-e465b535ce5b2318798c68e1454917204494bfe3.zip
op-kernel-dev-e465b535ce5b2318798c68e1454917204494bfe3.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask into cpus4096-v2
Diffstat (limited to 'arch')
-rw-r--r--arch/cris/include/asm/bitops.h1
-rw-r--r--arch/h8300/include/asm/bitops.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/cris/include/asm/bitops.h b/arch/cris/include/asm/bitops.h
index c0e62f8..9e69cfb 100644
--- a/arch/cris/include/asm/bitops.h
+++ b/arch/cris/include/asm/bitops.h
@@ -148,6 +148,7 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
#define ffs kernel_ffs
#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h>
#include <asm-generic/bitops/hweight.h>
#include <asm-generic/bitops/find.h>
diff --git a/arch/h8300/include/asm/bitops.h b/arch/h8300/include/asm/bitops.h
index cb18e3b..cb9ddf5 100644
--- a/arch/h8300/include/asm/bitops.h
+++ b/arch/h8300/include/asm/bitops.h
@@ -207,6 +207,7 @@ static __inline__ unsigned long __ffs(unsigned long word)
#endif /* __KERNEL__ */
#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/fls64.h>
#endif /* _H8300_BITOPS_H */
OpenPOWER on IntegriCloud