X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=include%2Fasm-h8300%2Fbitops.h;h=cb18e3b0aa948520b8f7321e6ead3d00eb1d5cf2;hb=538f0fd0f210c2ce5c585799f18d0e5c7cf6155e;hp=574f57b6c4d1852630f830a1da0f660a4c076efa;hpb=d62e54abca1146981fc9f98f85ff398a113a22c2;p=mv-sheeva.git

diff --git a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h
index 574f57b6c4d..cb18e3b0aa9 100644
--- a/include/asm-h8300/bitops.h
+++ b/include/asm-h8300/bitops.h
@@ -6,11 +6,15 @@
  * Copyright 2002, Yoshinori Sato
  */
 
-#include <linux/config.h>
 #include <linux/compiler.h>
 #include <asm/system.h>
 
 #ifdef __KERNEL__
+
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
 /*
  * Function prototypes to keep gcc -Wall happy
  */
@@ -195,6 +199,7 @@ static __inline__ unsigned long __ffs(unsigned long word)
 #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>
 #include <asm-generic/bitops/ext2-atomic.h>
 #include <asm-generic/bitops/minix.h>