summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-25 16:24:36 -0400
committerMike Frysinger <vapier@gentoo.org>2011-03-25 16:54:13 -0400
commit92a19d66a3cc17feae20b4c1147e8b4dbf7b2282 (patch)
treee68a5f05a70926a3d44dfcaa52dd8f562bbebf48
parent901c23fb18fad6506c90e17fa265970c311b9227 (diff)
downloadlinux-3.10-92a19d66a3cc17feae20b4c1147e8b4dbf7b2282.tar.gz
linux-3.10-92a19d66a3cc17feae20b4c1147e8b4dbf7b2282.tar.bz2
linux-3.10-92a19d66a3cc17feae20b4c1147e8b4dbf7b2282.zip
Blackfin: bitops: fix include order after little endian inclusion
The le.h header requires things like test_bit to be declared, so we need to move its inclusion to after the point where that happens. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/include/asm/bitops.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h
index 49762c6bb0d..8a0fed16058 100644
--- a/arch/blackfin/include/asm/bitops.h
+++ b/arch/blackfin/include/asm/bitops.h
@@ -25,7 +25,6 @@
#include <asm-generic/bitops/const_hweight.h>
#include <asm-generic/bitops/lock.h>
-#include <asm-generic/bitops/le.h>
#include <asm-generic/bitops/ext2-atomic.h>
#ifndef CONFIG_SMP
@@ -113,6 +112,9 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
#endif /* CONFIG_SMP */
+/* Needs to be after test_bit and friends */
+#include <asm-generic/bitops/le.h>
+
/*
* hweightN: returns the hamming weight (i.e. the number
* of bits set) of a N-bit word