Merge remote-tracking branch 'file-locks/linux-next'

[karo-tx-linux.git] / include / linux / io-mapping.h

diff --git a/include/linux/io-mapping.h b/include/linux/io-mapping.h
index c27dde7215b5b291394747d35e1f4a19d9f1ac8e..e399029b68c5bbdc5ae613c681217c9c554c0f9f 100644 (file)
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
@@ -21,7 +21,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/bug.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/page.h>
 
 /*