Merge branches 'release', 'acpi_disabled' and 'bugzilla-10958' into release

[firefly-linux-kernel-4.4.55.git] / include / asm-ia64 / cacheflush.h

diff --git a/include/asm-ia64/cacheflush.h b/include/asm-ia64/cacheflush.h
index 4906916d715b5d3ea95d53659218234afe0f42f3..afcfbda76e20f3f5914b579d16e0dae9c7f83249 100644 (file)
--- a/include/asm-ia64/cacheflush.h
+++ b/include/asm-ia64/cacheflush.h
@@ -7,8 +7,8 @@
  */
 
 #include <linux/page-flags.h>
+#include <linux/bitops.h>
 
-#include <asm/bitops.h>
 #include <asm/page.h>
 
 /*