Merge branch 'linus' into x86/x2apic

[linux-2.6-omap-h63xx.git] / arch / arm / mach-loki / lb88rc8480-setup.c

diff --git a/arch/arm/mach-loki/lb88rc8480-setup.c b/arch/arm/mach-loki/lb88rc8480-setup.c
index d1b9e6e6253a7a1a25b32a292d64c1f7f8d8e924..2cc9ac9b488f24cb8b87a72f50530cd6a34a4be5 100644 (file)
--- a/arch/arm/mach-loki/lb88rc8480-setup.c
+++ b/arch/arm/mach-loki/lb88rc8480-setup.c
@@ -19,7 +19,7 @@
 #include <linux/mv643xx_eth.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/loki.h>
+#include <mach/loki.h>
 #include "common.h"
 
 #define LB88RC8480_FLASH_BOOT_CS_BASE  0xf8000000