---

yaml --- r: 123577 b: refs/heads/master c: fa44c9e h: refs/heads/master i: 123575: 891ae2f v: v3
git-mirror · Nov 28, 2008 · 983c357 · 983c357
1 parent 3619551
commit 983c357
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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