Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk

author: Ben Dooks <ben-linux@fluff.org> 2008-08-08 16:10:12 -0400
committer: Ben Dooks <ben-linux@fluff.org> 2008-08-08 16:10:12 -0400
commit: af7a535688a758d15f06a98833e6a143b29af9de (patch)
tree: bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-s3c2440
parent: 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff)
parent: c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff)
11 files changed, 43 insertions, 43 deletions
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c
index 184d804934c9..95567e6daea1 100644
--- a/arch/arm/mach-s3c2440/clock.c
+++ b/arch/arm/mach-s3c2440/clock.c
@@ -34,12 +34,12 @@
 #include <linux/mutex.h>
 #include <linux/clk.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/arch/regs-clock.h>
+#include <mach/regs-clock.h>
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/cpu.h>
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c
index 0b1260827ac6..cdd4e6e79ac0 100644
--- a/arch/arm/mach-s3c2440/dma.c
+++ b/arch/arm/mach-s3c2440/dma.c
@@ -18,17 +18,17 @@
 #include <linux/serial_core.h>
 #include <asm/dma.h>
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 #include <asm/plat-s3c24xx/dma.h>
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-ac97.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
-#include <asm/arch/regs-sdi.h>
+#include <mach/regs-sdi.h>
 #include <asm/plat-s3c24xx/regs-iis.h>
 #include <asm/plat-s3c24xx/regs-spi.h>
diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c
index 2995ff5681bb..c0c67438d0a4 100644
--- a/arch/arm/mach-s3c2440/dsc.c
+++ b/arch/arm/mach-s3c2440/dsc.c
@@ -20,12 +20,12 @@
 #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/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
-#include <asm/arch/regs-dsc.h>
+#include <mach/regs-dsc.h>
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c
index a87608bc1a03..276b823f4e27 100644
--- a/arch/arm/mach-s3c2440/irq.c
+++ b/arch/arm/mach-s3c2440/irq.c
@@ -25,14 +25,14 @@
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/regs-irq.h>
+#include <mach/regs-irq.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c24xx/cpu.h>
 #include <asm/plat-s3c24xx/pm.h>
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index 0c33a932d65c..441f4bc09472 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -27,19 +27,19 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/anubis-map.h>
+#include <mach/anubis-map.h>
-#include <asm/arch/anubis-irq.h>
+#include <mach/anubis-irq.h>
-#include <asm/arch/anubis-cpld.h>
+#include <mach/anubis-cpld.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 <mach/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
 #include <asm/plat-s3c/nand.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c
index f5e3c7f27639..f0f0cc6afcf4 100644
--- a/arch/arm/mach-s3c2440/mach-at2440evb.c
+++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -27,14 +27,14 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/plat-s3c/regs-serial.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
 #include <asm/plat-s3c/nand.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c
index afe0d7b7e389..1a5e7027b41b 100644
--- a/arch/arm/mach-s3c2440/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2440/mach-nexcoder.c
@@ -29,13 +29,13 @@
 #include <asm/mach/irq.h>
 #include <asm/setup.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 //#include <asm/debug-ll.h>
-#include <asm/arch/regs-gpio.h>
+#include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-serial.h>
 #include <asm/plat-s3c24xx/s3c2410.h>
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 3869ca2c345e..8b83f93b6102 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -25,18 +25,18 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
-#include <asm/arch/osiris-map.h>
+#include <mach/osiris-map.h>
-#include <asm/arch/osiris-cpld.h>
+#include <mach/osiris-cpld.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 <mach/regs-gpio.h>
-#include <asm/arch/regs-mem.h>
+#include <mach/regs-mem.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
 #include <asm/plat-s3c/nand.h>
 #include <linux/mtd/mtd.h>
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index bac40c4878a5..e0b07e6a0a18 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -33,18 +33,18 @@
 #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 <mach/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
-#include <asm/arch/h1940.h>
+#include <mach/h1940.h>
 #include <asm/plat-s3c/nand.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/devs.h>
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 4552828bf800..327c8f371984 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.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 <mach/regs-gpio.h>
-#include <asm/arch/regs-lcd.h>
+#include <mach/regs-lcd.h>
-#include <asm/arch/idle.h>
+#include <mach/idle.h>
-#include <asm/arch/fb.h>
+#include <mach/fb.h>
 #include <asm/plat-s3c24xx/s3c2410.h>
 #include <asm/plat-s3c24xx/s3c2440.h>
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index 90e1da61fbc3..d6b9a92d284e 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -25,7 +25,7 @@
 #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>
author	Ben Dooks <ben-linux@fluff.org>	2008-08-08 16:10:12 -0400
committer	Ben Dooks <ben-linux@fluff.org>	2008-08-08 16:10:12 -0400
commit	af7a535688a758d15f06a98833e6a143b29af9de (patch)
tree	bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-s3c2440
parent	0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff)
parent	c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff)

diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c index 184d804934c9..95567e6daea1 100644 --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c
@@ -34,12 +34,12 @@
34	#include <linux/mutex.h>	34	#include <linux/mutex.h>
35	#include <linux/clk.h>	35	#include <linux/clk.h>
36		36
37	#include <asm/hardware.h>	37	#include <mach/hardware.h>
38	#include <asm/atomic.h>	38	#include <asm/atomic.h>
39	#include <asm/irq.h>	39	#include <asm/irq.h>
40	#include <asm/io.h>	40	#include <asm/io.h>
41		41
42	#include <asm/arch/regs-clock.h>	42	#include <mach/regs-clock.h>
43		43
44	#include <asm/plat-s3c24xx/clock.h>	44	#include <asm/plat-s3c24xx/clock.h>
45	#include <asm/plat-s3c24xx/cpu.h>	45	#include <asm/plat-s3c24xx/cpu.h>


diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index 0b1260827ac6..cdd4e6e79ac0 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c
@@ -18,17 +18,17 @@
18	#include <linux/serial_core.h>	18	#include <linux/serial_core.h>
19		19
20	#include <asm/dma.h>	20	#include <asm/dma.h>
21	#include <asm/arch/dma.h>	21	#include <mach/dma.h>
22		22
23	#include <asm/plat-s3c24xx/dma.h>	23	#include <asm/plat-s3c24xx/dma.h>
24	#include <asm/plat-s3c24xx/cpu.h>	24	#include <asm/plat-s3c24xx/cpu.h>
25		25
26	#include <asm/plat-s3c/regs-serial.h>	26	#include <asm/plat-s3c/regs-serial.h>
27	#include <asm/arch/regs-gpio.h>	27	#include <mach/regs-gpio.h>
28	#include <asm/plat-s3c/regs-ac97.h>	28	#include <asm/plat-s3c/regs-ac97.h>
29	#include <asm/arch/regs-mem.h>	29	#include <mach/regs-mem.h>
30	#include <asm/arch/regs-lcd.h>	30	#include <mach/regs-lcd.h>
31	#include <asm/arch/regs-sdi.h>	31	#include <mach/regs-sdi.h>
32	#include <asm/plat-s3c24xx/regs-iis.h>	32	#include <asm/plat-s3c24xx/regs-iis.h>
33	#include <asm/plat-s3c24xx/regs-spi.h>	33	#include <asm/plat-s3c24xx/regs-spi.h>
34		34


diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c index 2995ff5681bb..c0c67438d0a4 100644 --- a/arch/arm/mach-s3c2440/dsc.c +++ b/arch/arm/mach-s3c2440/dsc.c
@@ -20,12 +20,12 @@
20	#include <asm/mach/map.h>	20	#include <asm/mach/map.h>
21	#include <asm/mach/irq.h>	21	#include <asm/mach/irq.h>
22		22
23	#include <asm/hardware.h>	23	#include <mach/hardware.h>
24	#include <asm/io.h>	24	#include <asm/io.h>
25	#include <asm/irq.h>	25	#include <asm/irq.h>
26		26
27	#include <asm/arch/regs-gpio.h>	27	#include <mach/regs-gpio.h>
28	#include <asm/arch/regs-dsc.h>	28	#include <mach/regs-dsc.h>
29		29
30	#include <asm/plat-s3c24xx/cpu.h>	30	#include <asm/plat-s3c24xx/cpu.h>
31	#include <asm/plat-s3c24xx/s3c2440.h>	31	#include <asm/plat-s3c24xx/s3c2440.h>


diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c index a87608bc1a03..276b823f4e27 100644 --- a/arch/arm/mach-s3c2440/irq.c +++ b/arch/arm/mach-s3c2440/irq.c
@@ -25,14 +25,14 @@
25	#include <linux/ioport.h>	25	#include <linux/ioport.h>
26	#include <linux/sysdev.h>	26	#include <linux/sysdev.h>
27		27
28	#include <asm/hardware.h>	28	#include <mach/hardware.h>
29	#include <asm/irq.h>	29	#include <asm/irq.h>
30	#include <asm/io.h>	30	#include <asm/io.h>
31		31
32	#include <asm/mach/irq.h>	32	#include <asm/mach/irq.h>
33		33
34	#include <asm/arch/regs-irq.h>	34	#include <mach/regs-irq.h>
35	#include <asm/arch/regs-gpio.h>	35	#include <mach/regs-gpio.h>
36		36
37	#include <asm/plat-s3c24xx/cpu.h>	37	#include <asm/plat-s3c24xx/cpu.h>
38	#include <asm/plat-s3c24xx/pm.h>	38	#include <asm/plat-s3c24xx/pm.h>


diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 0c33a932d65c..441f4bc09472 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -27,19 +27,19 @@
27	#include <asm/mach/map.h>	27	#include <asm/mach/map.h>
28	#include <asm/mach/irq.h>	28	#include <asm/mach/irq.h>
29		29
30	#include <asm/arch/anubis-map.h>	30	#include <mach/anubis-map.h>
31	#include <asm/arch/anubis-irq.h>	31	#include <mach/anubis-irq.h>
32	#include <asm/arch/anubis-cpld.h>	32	#include <mach/anubis-cpld.h>
33		33
34	#include <asm/hardware.h>	34	#include <mach/hardware.h>
35	#include <asm/io.h>	35	#include <asm/io.h>
36	#include <asm/irq.h>	36	#include <asm/irq.h>
37	#include <asm/mach-types.h>	37	#include <asm/mach-types.h>
38		38
39	#include <asm/plat-s3c/regs-serial.h>	39	#include <asm/plat-s3c/regs-serial.h>
40	#include <asm/arch/regs-gpio.h>	40	#include <mach/regs-gpio.h>
41	#include <asm/arch/regs-mem.h>	41	#include <mach/regs-mem.h>
42	#include <asm/arch/regs-lcd.h>	42	#include <mach/regs-lcd.h>
43	#include <asm/plat-s3c/nand.h>	43	#include <asm/plat-s3c/nand.h>
44		44
45	#include <linux/mtd/mtd.h>	45	#include <linux/mtd/mtd.h>


diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index f5e3c7f27639..f0f0cc6afcf4 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -27,14 +27,14 @@
27	#include <asm/mach/map.h>	27	#include <asm/mach/map.h>
28	#include <asm/mach/irq.h>	28	#include <asm/mach/irq.h>
29		29
30	#include <asm/hardware.h>	30	#include <mach/hardware.h>
31	#include <asm/irq.h>	31	#include <asm/irq.h>
32	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>
33		33
34	#include <asm/plat-s3c/regs-serial.h>	34	#include <asm/plat-s3c/regs-serial.h>
35	#include <asm/arch/regs-gpio.h>	35	#include <mach/regs-gpio.h>
36	#include <asm/arch/regs-mem.h>	36	#include <mach/regs-mem.h>
37	#include <asm/arch/regs-lcd.h>	37	#include <mach/regs-lcd.h>
38	#include <asm/plat-s3c/nand.h>	38	#include <asm/plat-s3c/nand.h>
39		39
40	#include <linux/mtd/mtd.h>	40	#include <linux/mtd/mtd.h>


diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index afe0d7b7e389..1a5e7027b41b 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c
@@ -29,13 +29,13 @@
29	#include <asm/mach/irq.h>	29	#include <asm/mach/irq.h>
30		30
31	#include <asm/setup.h>	31	#include <asm/setup.h>
32	#include <asm/hardware.h>	32	#include <mach/hardware.h>
33	#include <asm/io.h>	33	#include <asm/io.h>
34	#include <asm/irq.h>	34	#include <asm/irq.h>
35	#include <asm/mach-types.h>	35	#include <asm/mach-types.h>
36		36
37	//#include <asm/debug-ll.h>	37	//#include <asm/debug-ll.h>
38	#include <asm/arch/regs-gpio.h>	38	#include <mach/regs-gpio.h>
39	#include <asm/plat-s3c/regs-serial.h>	39	#include <asm/plat-s3c/regs-serial.h>
40		40
41	#include <asm/plat-s3c24xx/s3c2410.h>	41	#include <asm/plat-s3c24xx/s3c2410.h>


diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 3869ca2c345e..8b83f93b6102 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -25,18 +25,18 @@
25	#include <asm/mach/map.h>	25	#include <asm/mach/map.h>
26	#include <asm/mach/irq.h>	26	#include <asm/mach/irq.h>
27		27
28	#include <asm/arch/osiris-map.h>	28	#include <mach/osiris-map.h>
29	#include <asm/arch/osiris-cpld.h>	29	#include <mach/osiris-cpld.h>
30		30
31	#include <asm/hardware.h>	31	#include <mach/hardware.h>
32	#include <asm/io.h>	32	#include <asm/io.h>
33	#include <asm/irq.h>	33	#include <asm/irq.h>
34	#include <asm/mach-types.h>	34	#include <asm/mach-types.h>
35		35
36	#include <asm/plat-s3c/regs-serial.h>	36	#include <asm/plat-s3c/regs-serial.h>
37	#include <asm/arch/regs-gpio.h>	37	#include <mach/regs-gpio.h>
38	#include <asm/arch/regs-mem.h>	38	#include <mach/regs-mem.h>
39	#include <asm/arch/regs-lcd.h>	39	#include <mach/regs-lcd.h>
40	#include <asm/plat-s3c/nand.h>	40	#include <asm/plat-s3c/nand.h>
41		41
42	#include <linux/mtd/mtd.h>	42	#include <linux/mtd/mtd.h>


diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index bac40c4878a5..e0b07e6a0a18 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -33,18 +33,18 @@
33	#include <asm/mach/map.h>	33	#include <asm/mach/map.h>
34	#include <asm/mach/irq.h>	34	#include <asm/mach/irq.h>
35		35
36	#include <asm/hardware.h>	36	#include <mach/hardware.h>
37	#include <asm/io.h>	37	#include <asm/io.h>
38	#include <asm/irq.h>	38	#include <asm/irq.h>
39	#include <asm/mach-types.h>	39	#include <asm/mach-types.h>
40		40
41	#include <asm/plat-s3c/regs-serial.h>	41	#include <asm/plat-s3c/regs-serial.h>
42	#include <asm/arch/regs-gpio.h>	42	#include <mach/regs-gpio.h>
43	#include <asm/arch/regs-lcd.h>	43	#include <mach/regs-lcd.h>
44		44
45	#include <asm/arch/h1940.h>	45	#include <mach/h1940.h>
46	#include <asm/plat-s3c/nand.h>	46	#include <asm/plat-s3c/nand.h>
47	#include <asm/arch/fb.h>	47	#include <mach/fb.h>
48		48
49	#include <asm/plat-s3c24xx/clock.h>	49	#include <asm/plat-s3c24xx/clock.h>
50	#include <asm/plat-s3c24xx/devs.h>	50	#include <asm/plat-s3c24xx/devs.h>


diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index 4552828bf800..327c8f371984 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -26,17 +26,17 @@
26	#include <asm/mach/map.h>	26	#include <asm/mach/map.h>
27	#include <asm/mach/irq.h>	27	#include <asm/mach/irq.h>
28		28
29	#include <asm/hardware.h>	29	#include <mach/hardware.h>
30	#include <asm/io.h>	30	#include <asm/io.h>
31	#include <asm/irq.h>	31	#include <asm/irq.h>
32	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>
33		33
34	#include <asm/plat-s3c/regs-serial.h>	34	#include <asm/plat-s3c/regs-serial.h>
35	#include <asm/arch/regs-gpio.h>	35	#include <mach/regs-gpio.h>
36	#include <asm/arch/regs-lcd.h>	36	#include <mach/regs-lcd.h>
37		37
38	#include <asm/arch/idle.h>	38	#include <mach/idle.h>
39	#include <asm/arch/fb.h>	39	#include <mach/fb.h>
40		40
41	#include <asm/plat-s3c24xx/s3c2410.h>	41	#include <asm/plat-s3c24xx/s3c2410.h>
42	#include <asm/plat-s3c24xx/s3c2440.h>	42	#include <asm/plat-s3c24xx/s3c2440.h>


diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c index 90e1da61fbc3..d6b9a92d284e 100644 --- a/arch/arm/mach-s3c2440/s3c2440.c +++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -25,7 +25,7 @@
25	#include <asm/mach/map.h>	25	#include <asm/mach/map.h>
26	#include <asm/mach/irq.h>	26	#include <asm/mach/irq.h>
27		27
28	#include <asm/hardware.h>	28	#include <mach/hardware.h>
29	#include <asm/io.h>	29	#include <asm/io.h>
30	#include <asm/irq.h>	30	#include <asm/irq.h>
31		31