Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6] / include / asm-sh / bitops.h

diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h
index 9d7021723a25363c0828f4b3422ef9fc1b52d145..df805f20b26786a3d74478a0c2fd6e10bf1777e5 100644 (file)
--- a/include/asm-sh/bitops.h
+++ b/include/asm-sh/bitops.h
@@ -2,6 +2,11 @@
 #define __ASM_SH_BITOPS_H
 
 #ifdef __KERNEL__
+
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
 #include <asm/system.h>
 /* For __swab32 */
 #include <asm/byteorder.h>