Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[~andy/linux] / drivers / serial / clps711x.c

diff --git a/drivers/serial/clps711x.c b/drivers/serial/clps711x.c
index 459f3420a4291de151c5c3767d66dab5d2d48e46..80e76426131df6448349a033fa96065ea1d9ff61 100644 (file)
--- a/drivers/serial/clps711x.c
+++ b/drivers/serial/clps711x.c
@@ -38,9 +38,9 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hardware/clps7111.h>