summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2443/mach-smdk2443.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-21 13:28:24 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-21 13:28:24 +0200
commit470fba7ebe60ad9185056b080b331abad24b4df9 (patch)
treef83bc13d97adaf5dd0e0f1d6a157b890f868577f /arch/arm/mach-s3c2443/mach-smdk2443.c
parentdocumentation: move mtrr.txt to Doc/x86/ subdir (diff)
parentLinux v2.6.27-rc4 (diff)
downloadlinux-470fba7ebe60ad9185056b080b331abad24b4df9.tar.xz
linux-470fba7ebe60ad9185056b080b331abad24b4df9.zip
Merge branch 'linus' into x86/doc
Diffstat (limited to 'arch/arm/mach-s3c2443/mach-smdk2443.c')
-rw-r--r--arch/arm/mach-s3c2443/mach-smdk2443.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2443/mach-smdk2443.c b/arch/arm/mach-s3c2443/mach-smdk2443.c
index 8cd93130ef36..e3c0d587bd10 100644
--- a/arch/arm/mach-s3c2443/mach-smdk2443.c
+++ b/arch/arm/mach-s3c2443/mach-smdk2443.c
@@ -26,17 +26,17 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach-types.h>
#include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-gpio.h>
+#include <mach/regs-lcd.h>
-#include <asm/arch/idle.h>
-#include <asm/arch/fb.h>
+#include <mach/idle.h>
+#include <mach/fb.h>
#include <asm/plat-s3c24xx/s3c2410.h>
#include <asm/plat-s3c24xx/s3c2440.h>