virtio: bus_id for devices should contain 'virtio'

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

diff --git a/include/asm-h8300/bitops.h b/include/asm-h8300/bitops.h
index d76299c98b817ad0c492a276f79262bb22fea8d8..cb18e3b0aa948520b8f7321e6ead3d00eb1d5cf2 100644 (file)
--- a/include/asm-h8300/bitops.h
+++ b/include/asm-h8300/bitops.h
@@ -10,6 +10,11 @@
 #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
  */
@@ -194,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>