Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6-omap-h63xx.git] / include / asm-um / bitops.h

diff --git a/include/asm-um/bitops.h b/include/asm-um/bitops.h
index 46d781953d3ad7c5fa42e92f3c0489bf5eeccf64..e4d38d437b97c4baefc2d1dc47bf34d61fc9ccf1 100644 (file)
--- a/include/asm-um/bitops.h
+++ b/include/asm-um/bitops.h
@@ -1,6 +1,10 @@
 #ifndef __UM_BITOPS_H
 #define __UM_BITOPS_H
 
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
 #include "asm/arch/bitops.h"
 
 #endif