Merge branch 'merge' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer...

[~andy/linux] / arch / arm / mach-lh7a40x / clcd.c

diff --git a/arch/arm/mach-lh7a40x/clcd.c b/arch/arm/mach-lh7a40x/clcd.c
index 395ad9b83c400db0f9b8c7f0e2af6bdff2c46890..a2a543258fc371d5d36123ca394b4f3774866f34 100644 (file)
--- a/arch/arm/mach-lh7a40x/clcd.c
+++ b/arch/arm/mach-lh7a40x/clcd.c
@@ -23,7 +23,7 @@
 #include <asm/mach/irq.h>
 
 #include <asm/system.h>
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/clcd.h>