Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/include/asm-frv/bitops.h b/include/asm-frv/bitops.h
index 8dba74b1a2549e10a520ae9766151f4e613c77a6..e29de7131b79dcca7250aad73b3d603fb1f53458 100644 (file)
--- a/include/asm-frv/bitops.h
+++ b/include/asm-frv/bitops.h
@@ -21,6 +21,10 @@
 
 #ifdef __KERNEL__
 
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
 #include <asm-generic/bitops/ffz.h>
 
 /*