X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-v850%2Fbitops.h;h=f82f5b4a56e0d0526d3d2e53023e90ab65aeaab0;hb=b6cf160c4b788a31f6a4017a469b956ca77febf4;hp=1f6fd5ab4177badda30517f04e339b84a471c144;hpb=86579dd06deecfa6ac88d5e84e4d63c397cd6f6d;p=powerpc.git

diff --git a/include/asm-v850/bitops.h b/include/asm-v850/bitops.h
index 1f6fd5ab41..f82f5b4a56 100644
--- a/include/asm-v850/bitops.h
+++ b/include/asm-v850/bitops.h
@@ -13,8 +13,10 @@
 #ifndef __V850_BITOPS_H__
 #define __V850_BITOPS_H__
 
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
 
-#include <linux/config.h>
 #include <linux/compiler.h>	/* unlikely  */
 #include <asm/byteorder.h>	/* swab32 */
 #include <asm/system.h>		/* interrupt enable/disable */
@@ -146,6 +148,7 @@ static inline int __test_bit (int nr, const void *addr)
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #define ext2_set_bit_atomic(l,n,a)      test_and_set_bit(n,a)