Merge branch 's3c-move' into devel

Conflicts: arch/arm/mach-versatile/core.c
author: Russell King <rmk@dyn-67.arm.linux.org.uk> 2008-10-14 17:24:51 -0400
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2008-10-14 17:24:51 -0400
commit: 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch)
tree: 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/mach-s3c2440
parent: b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff)
parent: d5120ae72a066b18f98e0c45ce73262f58030851 (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 40503a65bacf..d1c29b2537cd 100644
--- a/arch/arm/mach-s3c2440/clock.c
+++ b/arch/arm/mach-s3c2440/clock.c
@@ -41,8 +41,8 @@
 #include <mach/regs-clock.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
 /* S3C2440 extended clock support */
diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c
index cdd4e6e79ac0..32303f6a8321 100644
--- a/arch/arm/mach-s3c2440/dma.c
+++ b/arch/arm/mach-s3c2440/dma.c
@@ -20,10 +20,10 @@
 #include <asm/dma.h>
 #include <mach/dma.h>
-#include <asm/plat-s3c24xx/dma.h>
+#include <plat/dma.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <asm/plat-s3c/regs-ac97.h>
 #include <mach/regs-mem.h>
diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c
index 4f7d06baf0d3..554044272771 100644
--- a/arch/arm/mach-s3c2440/dsc.c
+++ b/arch/arm/mach-s3c2440/dsc.c
@@ -27,8 +27,8 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-dsc.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
-#include <asm/plat-s3c24xx/s3c2440.h>
+#include <plat/s3c2440.h>
 int s3c2440_set_dsc(unsigned int pin, unsigned int value)
 {
diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c
index 33e3ede0a2b3..63c5ab65727f 100644
--- a/arch/arm/mach-s3c2440/irq.c
+++ b/arch/arm/mach-s3c2440/irq.c
@@ -34,9 +34,9 @@
 #include <mach/regs-irq.h>
 #include <mach/regs-gpio.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
-#include <asm/plat-s3c24xx/pm.h>
+#include <plat/pm.h>
-#include <asm/plat-s3c24xx/irq.h>
+#include <plat/irq.h>
 /* WDT/AC97 */
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c
index 19eb0e5269ac..e2beca470484 100644
--- a/arch/arm/mach-s3c2440/mach-anubis.c
+++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -35,7 +35,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
@@ -48,9 +48,9 @@
 #include <net/ax88796.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
 #define COPYRIGHT ", (c) 2005 Simtec Electronics"
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c
index f0f0cc6afcf4..66876c6f2f1c 100644
--- a/arch/arm/mach-s3c2440/mach-at2440evb.c
+++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -31,7 +31,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
@@ -42,9 +42,9 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
 static struct map_desc at2440evb_iodesc[] __initdata = {
        /* Nothing here */
diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c
index 49e828d1d4d8..a546307fd53d 100644
--- a/arch/arm/mach-s3c2440/mach-nexcoder.c
+++ b/arch/arm/mach-s3c2440/mach-nexcoder.c
@@ -36,13 +36,13 @@
 //#include <asm/debug-ll.h>
 #include <mach/regs-gpio.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
-#include <asm/plat-s3c24xx/s3c2410.h>
+#include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/s3c2440.h>
+#include <plat/s3c2440.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
 static struct map_desc nexcoder_iodesc[] __initdata = {
        /* nothing here yet */
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 85144aa52c27..2361d606abc5 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -33,7 +33,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
@@ -44,9 +44,9 @@
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
 /* onboard perihperal map */
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index a4c690456d19..4d14c7cff892 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -37,7 +37,7 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
@@ -45,10 +45,10 @@
 #include <asm/plat-s3c/nand.h>
 #include <mach/fb.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
-#include <asm/plat-s3c24xx/pm.h>
+#include <plat/pm.h>
 static struct map_desc rx3715_iodesc[] __initdata = {
        /* dump ISA space somewhere unused */
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 7ac60b869e7f..fefeaaa4155f 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -31,20 +31,20 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
 #include <mach/idle.h>
 #include <mach/fb.h>
-#include <asm/plat-s3c24xx/s3c2410.h>
+#include <plat/s3c2410.h>
-#include <asm/plat-s3c24xx/s3c2440.h>
+#include <plat/s3c2440.h>
-#include <asm/plat-s3c24xx/clock.h>
+#include <plat/clock.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
-#include <asm/plat-s3c24xx/common-smdk.h>
+#include <plat/common-smdk.h>
 static struct map_desc smdk2440_iodesc[] __initdata = {
        /* ISA IO Space map (memory space selected by A24) */
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index c81cdb330712..ac1f7ea5f405 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -29,9 +29,9 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/plat-s3c24xx/s3c2440.h>
+#include <plat/s3c2440.h>
-#include <asm/plat-s3c24xx/devs.h>
+#include <plat/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
+#include <plat/cpu.h>
 static struct sys_device s3c2440_sysdev = {
        .cls            = &s3c2440_sysclass,
author	Russell King <rmk@dyn-67.arm.linux.org.uk>	2008-10-14 17:24:51 -0400
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2008-10-14 17:24:51 -0400
commit	7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch)
tree	0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/mach-s3c2440
parent	b6825d2df55aa7d7341c715b577b73a6a03dc944 (diff)
parent	d5120ae72a066b18f98e0c45ce73262f58030851 (diff)

diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c index 40503a65bacf..d1c29b2537cd 100644 --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c
@@ -41,8 +41,8 @@
41		41
42	#include <mach/regs-clock.h>	42	#include <mach/regs-clock.h>
43		43
44	#include <asm/plat-s3c24xx/clock.h>	44	#include <plat/clock.h>
45	#include <asm/plat-s3c24xx/cpu.h>	45	#include <plat/cpu.h>
46		46
47	/* S3C2440 extended clock support */	47	/* S3C2440 extended clock support */
48		48


diff --git a/arch/arm/mach-s3c2440/dma.c b/arch/arm/mach-s3c2440/dma.c index cdd4e6e79ac0..32303f6a8321 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c
@@ -20,10 +20,10 @@
20	#include <asm/dma.h>	20	#include <asm/dma.h>
21	#include <mach/dma.h>	21	#include <mach/dma.h>
22		22
23	#include <asm/plat-s3c24xx/dma.h>	23	#include <plat/dma.h>
24	#include <asm/plat-s3c24xx/cpu.h>	24	#include <plat/cpu.h>
25		25
26	#include <asm/plat-s3c/regs-serial.h>	26	#include <plat/regs-serial.h>
27	#include <mach/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 <mach/regs-mem.h>	29	#include <mach/regs-mem.h>


diff --git a/arch/arm/mach-s3c2440/dsc.c b/arch/arm/mach-s3c2440/dsc.c index 4f7d06baf0d3..554044272771 100644 --- a/arch/arm/mach-s3c2440/dsc.c +++ b/arch/arm/mach-s3c2440/dsc.c
@@ -27,8 +27,8 @@
27	#include <mach/regs-gpio.h>	27	#include <mach/regs-gpio.h>
28	#include <mach/regs-dsc.h>	28	#include <mach/regs-dsc.h>
29		29
30	#include <asm/plat-s3c24xx/cpu.h>	30	#include <plat/cpu.h>
31	#include <asm/plat-s3c24xx/s3c2440.h>	31	#include <plat/s3c2440.h>
32		32
33	int s3c2440_set_dsc(unsigned int pin, unsigned int value)	33	int s3c2440_set_dsc(unsigned int pin, unsigned int value)
34	{	34	{


diff --git a/arch/arm/mach-s3c2440/irq.c b/arch/arm/mach-s3c2440/irq.c index 33e3ede0a2b3..63c5ab65727f 100644 --- a/arch/arm/mach-s3c2440/irq.c +++ b/arch/arm/mach-s3c2440/irq.c
@@ -34,9 +34,9 @@
34	#include <mach/regs-irq.h>	34	#include <mach/regs-irq.h>
35	#include <mach/regs-gpio.h>	35	#include <mach/regs-gpio.h>
36		36
37	#include <asm/plat-s3c24xx/cpu.h>	37	#include <plat/cpu.h>
38	#include <asm/plat-s3c24xx/pm.h>	38	#include <plat/pm.h>
39	#include <asm/plat-s3c24xx/irq.h>	39	#include <plat/irq.h>
40		40
41	/* WDT/AC97 */	41	/* WDT/AC97 */
42		42


diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 19eb0e5269ac..e2beca470484 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c
@@ -35,7 +35,7 @@
35	#include <asm/irq.h>	35	#include <asm/irq.h>
36	#include <asm/mach-types.h>	36	#include <asm/mach-types.h>
37		37
38	#include <asm/plat-s3c/regs-serial.h>	38	#include <plat/regs-serial.h>
39	#include <mach/regs-gpio.h>	39	#include <mach/regs-gpio.h>
40	#include <mach/regs-mem.h>	40	#include <mach/regs-mem.h>
41	#include <mach/regs-lcd.h>	41	#include <mach/regs-lcd.h>
@@ -48,9 +48,9 @@
48		48
49	#include <net/ax88796.h>	49	#include <net/ax88796.h>
50		50
51	#include <asm/plat-s3c24xx/clock.h>	51	#include <plat/clock.h>
52	#include <asm/plat-s3c24xx/devs.h>	52	#include <plat/devs.h>
53	#include <asm/plat-s3c24xx/cpu.h>	53	#include <plat/cpu.h>
54		54
55	#define COPYRIGHT ", (c) 2005 Simtec Electronics"	55	#define COPYRIGHT ", (c) 2005 Simtec Electronics"
56		56


diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index f0f0cc6afcf4..66876c6f2f1c 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c
@@ -31,7 +31,7 @@
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 <plat/regs-serial.h>
35	#include <mach/regs-gpio.h>	35	#include <mach/regs-gpio.h>
36	#include <mach/regs-mem.h>	36	#include <mach/regs-mem.h>
37	#include <mach/regs-lcd.h>	37	#include <mach/regs-lcd.h>
@@ -42,9 +42,9 @@
42	#include <linux/mtd/nand_ecc.h>	42	#include <linux/mtd/nand_ecc.h>
43	#include <linux/mtd/partitions.h>	43	#include <linux/mtd/partitions.h>
44		44
45	#include <asm/plat-s3c24xx/clock.h>	45	#include <plat/clock.h>
46	#include <asm/plat-s3c24xx/devs.h>	46	#include <plat/devs.h>
47	#include <asm/plat-s3c24xx/cpu.h>	47	#include <plat/cpu.h>
48		48
49	static struct map_desc at2440evb_iodesc[] __initdata = {	49	static struct map_desc at2440evb_iodesc[] __initdata = {
50	/* Nothing here */	50	/* Nothing here */


diff --git a/arch/arm/mach-s3c2440/mach-nexcoder.c b/arch/arm/mach-s3c2440/mach-nexcoder.c index 49e828d1d4d8..a546307fd53d 100644 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c
@@ -36,13 +36,13 @@
36		36
37	//#include <asm/debug-ll.h>	37	//#include <asm/debug-ll.h>
38	#include <mach/regs-gpio.h>	38	#include <mach/regs-gpio.h>
39	#include <asm/plat-s3c/regs-serial.h>	39	#include <plat/regs-serial.h>
40		40
41	#include <asm/plat-s3c24xx/s3c2410.h>	41	#include <plat/s3c2410.h>
42	#include <asm/plat-s3c24xx/s3c2440.h>	42	#include <plat/s3c2440.h>
43	#include <asm/plat-s3c24xx/clock.h>	43	#include <plat/clock.h>
44	#include <asm/plat-s3c24xx/devs.h>	44	#include <plat/devs.h>
45	#include <asm/plat-s3c24xx/cpu.h>	45	#include <plat/cpu.h>
46		46
47	static struct map_desc nexcoder_iodesc[] __initdata = {	47	static struct map_desc nexcoder_iodesc[] __initdata = {
48	/* nothing here yet */	48	/* nothing here yet */


diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c index 85144aa52c27..2361d606abc5 100644 --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -33,7 +33,7 @@
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 <plat/regs-serial.h>
37	#include <mach/regs-gpio.h>	37	#include <mach/regs-gpio.h>
38	#include <mach/regs-mem.h>	38	#include <mach/regs-mem.h>
39	#include <mach/regs-lcd.h>	39	#include <mach/regs-lcd.h>
@@ -44,9 +44,9 @@
44	#include <linux/mtd/nand_ecc.h>	44	#include <linux/mtd/nand_ecc.h>
45	#include <linux/mtd/partitions.h>	45	#include <linux/mtd/partitions.h>
46		46
47	#include <asm/plat-s3c24xx/clock.h>	47	#include <plat/clock.h>
48	#include <asm/plat-s3c24xx/devs.h>	48	#include <plat/devs.h>
49	#include <asm/plat-s3c24xx/cpu.h>	49	#include <plat/cpu.h>
50		50
51	/* onboard perihperal map */	51	/* onboard perihperal map */
52		52


diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index a4c690456d19..4d14c7cff892 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -37,7 +37,7 @@
37	#include <asm/irq.h>	37	#include <asm/irq.h>
38	#include <asm/mach-types.h>	38	#include <asm/mach-types.h>
39		39
40	#include <asm/plat-s3c/regs-serial.h>	40	#include <plat/regs-serial.h>
41	#include <mach/regs-gpio.h>	41	#include <mach/regs-gpio.h>
42	#include <mach/regs-lcd.h>	42	#include <mach/regs-lcd.h>
43		43
@@ -45,10 +45,10 @@
45	#include <asm/plat-s3c/nand.h>	45	#include <asm/plat-s3c/nand.h>
46	#include <mach/fb.h>	46	#include <mach/fb.h>
47		47
48	#include <asm/plat-s3c24xx/clock.h>	48	#include <plat/clock.h>
49	#include <asm/plat-s3c24xx/devs.h>	49	#include <plat/devs.h>
50	#include <asm/plat-s3c24xx/cpu.h>	50	#include <plat/cpu.h>
51	#include <asm/plat-s3c24xx/pm.h>	51	#include <plat/pm.h>
52		52
53	static struct map_desc rx3715_iodesc[] __initdata = {	53	static struct map_desc rx3715_iodesc[] __initdata = {
54	/* dump ISA space somewhere unused */	54	/* dump ISA space somewhere unused */


diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index 7ac60b869e7f..fefeaaa4155f 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -31,20 +31,20 @@
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 <plat/regs-serial.h>
35	#include <mach/regs-gpio.h>	35	#include <mach/regs-gpio.h>
36	#include <mach/regs-lcd.h>	36	#include <mach/regs-lcd.h>
37		37
38	#include <mach/idle.h>	38	#include <mach/idle.h>
39	#include <mach/fb.h>	39	#include <mach/fb.h>
40		40
41	#include <asm/plat-s3c24xx/s3c2410.h>	41	#include <plat/s3c2410.h>
42	#include <asm/plat-s3c24xx/s3c2440.h>	42	#include <plat/s3c2440.h>
43	#include <asm/plat-s3c24xx/clock.h>	43	#include <plat/clock.h>
44	#include <asm/plat-s3c24xx/devs.h>	44	#include <plat/devs.h>
45	#include <asm/plat-s3c24xx/cpu.h>	45	#include <plat/cpu.h>
46		46
47	#include <asm/plat-s3c24xx/common-smdk.h>	47	#include <plat/common-smdk.h>
48		48
49	static struct map_desc smdk2440_iodesc[] __initdata = {	49	static struct map_desc smdk2440_iodesc[] __initdata = {
50	/* ISA IO Space map (memory space selected by A24) */	50	/* ISA IO Space map (memory space selected by A24) */


diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c index c81cdb330712..ac1f7ea5f405 100644 --- a/arch/arm/mach-s3c2440/s3c2440.c +++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -29,9 +29,9 @@
29	#include <mach/hardware.h>	29	#include <mach/hardware.h>
30	#include <asm/irq.h>	30	#include <asm/irq.h>
31		31
32	#include <asm/plat-s3c24xx/s3c2440.h>	32	#include <plat/s3c2440.h>
33	#include <asm/plat-s3c24xx/devs.h>	33	#include <plat/devs.h>
34	#include <asm/plat-s3c24xx/cpu.h>	34	#include <plat/cpu.h>
35		35
36	static struct sys_device s3c2440_sysdev = {	36	static struct sys_device s3c2440_sysdev = {
37	.cls = &s3c2440_sysclass,	37	.cls = &s3c2440_sysclass,