diff options
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r-- | arch/arm/mach-s3c2440/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/dma.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/dsc.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/irq.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-nexcoder.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-osiris.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/mach-smdk2440.c | 10 | ||||
-rw-r--r-- | arch/arm/mach-s3c2440/s3c2440.c | 6 |
11 files changed, 34 insertions, 34 deletions
diff --git a/arch/arm/mach-s3c2440/clock.c b/arch/arm/mach-s3c2440/clock.c index 95567e6daea1..bb1101f6a896 100644 --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <mach/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 <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..b674f869e57c 100644 --- a/arch/arm/mach-s3c2440/dma.c +++ b/arch/arm/mach-s3c2440/dma.c | |||
@@ -21,9 +21,9 @@ | |||
21 | #include <mach/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 <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 c0c67438d0a4..a0d49a982096 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 276b823f4e27..a23cffbfcce8 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 441f4bc09472..a37f8b220572 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
@@ -36,7 +36,7 @@ | |||
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 <plat/regs-serial.h> |
40 | #include <mach/regs-gpio.h> | 40 | #include <mach/regs-gpio.h> |
41 | #include <mach/regs-mem.h> | 41 | #include <mach/regs-mem.h> |
42 | #include <mach/regs-lcd.h> | 42 | #include <mach/regs-lcd.h> |
@@ -50,8 +50,8 @@ | |||
50 | #include <net/ax88796.h> | 50 | #include <net/ax88796.h> |
51 | 51 | ||
52 | #include <asm/plat-s3c24xx/clock.h> | 52 | #include <asm/plat-s3c24xx/clock.h> |
53 | #include <asm/plat-s3c24xx/devs.h> | 53 | #include <plat/devs.h> |
54 | #include <asm/plat-s3c24xx/cpu.h> | 54 | #include <plat/cpu.h> |
55 | 55 | ||
56 | #define COPYRIGHT ", (c) 2005 Simtec Electronics" | 56 | #define COPYRIGHT ", (c) 2005 Simtec Electronics" |
57 | 57 | ||
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index f0f0cc6afcf4..5114b87d8cfd 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> |
@@ -43,8 +43,8 @@ | |||
43 | #include <linux/mtd/partitions.h> | 43 | #include <linux/mtd/partitions.h> |
44 | 44 | ||
45 | #include <asm/plat-s3c24xx/clock.h> | 45 | #include <asm/plat-s3c24xx/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 1a5e7027b41b..9d8259589856 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 <asm/plat-s3c24xx/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 8b83f93b6102..5b1c32e64f0b 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> |
@@ -45,8 +45,8 @@ | |||
45 | #include <linux/mtd/partitions.h> | 45 | #include <linux/mtd/partitions.h> |
46 | 46 | ||
47 | #include <asm/plat-s3c24xx/clock.h> | 47 | #include <asm/plat-s3c24xx/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 e0b07e6a0a18..46128a170fed 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
@@ -38,7 +38,7 @@ | |||
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 <plat/regs-serial.h> |
42 | #include <mach/regs-gpio.h> | 42 | #include <mach/regs-gpio.h> |
43 | #include <mach/regs-lcd.h> | 43 | #include <mach/regs-lcd.h> |
44 | 44 | ||
@@ -47,9 +47,9 @@ | |||
47 | #include <mach/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 <plat/devs.h> |
51 | #include <asm/plat-s3c24xx/cpu.h> | 51 | #include <plat/cpu.h> |
52 | #include <asm/plat-s3c24xx/pm.h> | 52 | #include <plat/pm.h> |
53 | 53 | ||
54 | static struct map_desc rx3715_iodesc[] __initdata = { | 54 | static struct map_desc rx3715_iodesc[] __initdata = { |
55 | /* dump ISA space somewhere unused */ | 55 | /* dump ISA space somewhere unused */ |
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c index 327c8f371984..e1799abec87d 100644 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c | |||
@@ -31,18 +31,18 @@ | |||
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 <asm/plat-s3c24xx/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 <asm/plat-s3c24xx/common-smdk.h> |
48 | 48 | ||
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c index d6b9a92d284e..52e527eebee4 100644 --- a/arch/arm/mach-s3c2440/s3c2440.c +++ b/arch/arm/mach-s3c2440/s3c2440.c | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <asm/io.h> | 29 | #include <asm/io.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, |