diff --git a/[refs] b/[refs]
index 18389b504c06..478caee37c24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 275c8a21db9ba7b63366dc253ddbe15e3a1b6e20
+refs/heads/master: fa44c9e21f93f90800a56bacc74baa884e155b16
diff --git a/trunk/arch/arm/mach-lh7a40x/include/mach/io.h b/trunk/arch/arm/mach-lh7a40x/include/mach/io.h
index 031d26f9163c..e41422db97a6 100644
--- a/trunk/arch/arm/mach-lh7a40x/include/mach/io.h
+++ b/trunk/arch/arm/mach-lh7a40x/include/mach/io.h
@@ -11,8 +11,6 @@
 #ifndef __ASM_ARCH_IO_H
 #define __ASM_ARCH_IO_H
 
-#include <mach/hardware.h>
-
 #define IO_SPACE_LIMIT 0xffffffff
 
 /* No ISA or PCI bus on this machine. */
diff --git a/trunk/drivers/serial/serial_lh7a40x.c b/trunk/drivers/serial/serial_lh7a40x.c
index 61dc8b3daa26..a7bf024a8286 100644
--- a/trunk/drivers/serial/serial_lh7a40x.c
+++ b/trunk/drivers/serial/serial_lh7a40x.c
@@ -41,9 +41,10 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/serial.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
+#include <mach/hardware.h>
 
 #define DEV_MAJOR	204
 #define DEV_MINOR	16