Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-drm-fsl-dcu.git] / lib / iomap.c

diff --git a/lib/iomap.c b/lib/iomap.c
index d6ccdd85df5311a4326bf584920a1293dc11243c..4d43f37c01544de2b19e46bd259bdbe3fc5b7caf 100644 (file)
--- a/lib/iomap.c
+++ b/lib/iomap.c
@@ -4,8 +4,9 @@
  * (C) Copyright 2004 Linus Torvalds
  */
 #include <linux/pci.h>
+#include <linux/io.h>
+
 #include <linux/module.h>
-#include <asm/io.h>
 
 /*
  * Read/write from/to an (offsettable) iomem cookie. It might be a PIO