Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

[linux-2.6-omap-h63xx.git] / include / linux / of.h

diff --git a/include/linux/of.h b/include/linux/of.h
index 6df80e9859147973ecd06d6c2863d400b838d71a..5c39b9270ff7007b359df90a7cfc407607ddb7ab 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -16,8 +16,8 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <linux/types.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/prom.h>
 
 /* flag descriptions */