Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / sa11xx_base.c

diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index 810ac492a8c9eedc1a85e790610e846dd54ce6f0..e15d59f2d8a90f76f0b1e1a55e377956f8801f18 100644 (file)
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -36,9 +36,9 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>