diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-05 11:14:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:48 -0400 |
commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
tree | 69689f467179891b498bd7423fcf61925173db31 /arch/arm/plat-s3c24xx | |
parent | a1b81a84fff05dbfef45b7012c26e1fee9973e5d (diff) |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r-- | arch/arm/plat-s3c24xx/clock.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/common-smdk.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/cpu.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/dma.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/gpio.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/gpiolib.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/irq.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/pm-simtec.c | 8 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/pm.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/pwm-clock.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x-irq.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c244x.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/sleep.S | 10 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/time.c | 4 |
16 files changed, 49 insertions, 49 deletions
diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c index 373d04358485..54d4b8e2263c 100644 --- a/arch/arm/plat-s3c24xx/clock.c +++ b/arch/arm/plat-s3c24xx/clock.c | |||
@@ -40,12 +40,12 @@ | |||
40 | #include <linux/mutex.h> | 40 | #include <linux/mutex.h> |
41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
42 | 42 | ||
43 | #include <asm/arch/hardware.h> | 43 | #include <mach/hardware.h> |
44 | #include <asm/irq.h> | 44 | #include <asm/irq.h> |
45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
46 | 46 | ||
47 | #include <asm/arch/regs-clock.h> | 47 | #include <mach/regs-clock.h> |
48 | #include <asm/arch/regs-gpio.h> | 48 | #include <mach/regs-gpio.h> |
49 | 49 | ||
50 | #include <asm/plat-s3c24xx/clock.h> | 50 | #include <asm/plat-s3c24xx/clock.h> |
51 | #include <asm/plat-s3c24xx/cpu.h> | 51 | #include <asm/plat-s3c24xx/cpu.h> |
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index a608aa388820..1863a1b1bc49 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c | |||
@@ -31,12 +31,12 @@ | |||
31 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
32 | 32 | ||
33 | #include <asm/mach-types.h> | 33 | #include <asm/mach-types.h> |
34 | #include <asm/arch/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 | 37 | ||
38 | #include <asm/arch/regs-gpio.h> | 38 | #include <mach/regs-gpio.h> |
39 | #include <asm/arch/leds-gpio.h> | 39 | #include <mach/leds-gpio.h> |
40 | 40 | ||
41 | #include <asm/plat-s3c/nand.h> | 41 | #include <asm/plat-s3c/nand.h> |
42 | 42 | ||
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index 05a1d9cc280c..6d60f0476bb8 100644 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | 32 | ||
33 | #include <asm/arch/hardware.h> | 33 | #include <mach/hardware.h> |
34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
35 | #include <asm/io.h> | 35 | #include <asm/io.h> |
36 | #include <asm/delay.h> | 36 | #include <asm/delay.h> |
@@ -39,9 +39,9 @@ | |||
39 | #include <asm/mach/arch.h> | 39 | #include <asm/mach/arch.h> |
40 | #include <asm/mach/map.h> | 40 | #include <asm/mach/map.h> |
41 | 41 | ||
42 | #include <asm/arch/system-reset.h> | 42 | #include <mach/system-reset.h> |
43 | 43 | ||
44 | #include <asm/arch/regs-gpio.h> | 44 | #include <mach/regs-gpio.h> |
45 | #include <asm/plat-s3c/regs-serial.h> | 45 | #include <asm/plat-s3c/regs-serial.h> |
46 | 46 | ||
47 | #include <asm/plat-s3c24xx/cpu.h> | 47 | #include <asm/plat-s3c24xx/cpu.h> |
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 5c6f446a1fa9..d6fb76578b11 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
@@ -23,8 +23,8 @@ | |||
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/mach/map.h> | 24 | #include <asm/mach/map.h> |
25 | #include <asm/mach/irq.h> | 25 | #include <asm/mach/irq.h> |
26 | #include <asm/arch/fb.h> | 26 | #include <mach/fb.h> |
27 | #include <asm/arch/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | 30 | ||
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c index 8ae5719d6b3b..08c2aaf14c41 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c | |||
@@ -29,12 +29,12 @@ | |||
29 | 29 | ||
30 | #include <asm/system.h> | 30 | #include <asm/system.h> |
31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
32 | #include <asm/arch/hardware.h> | 32 | #include <mach/hardware.h> |
33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
34 | #include <asm/dma.h> | 34 | #include <asm/dma.h> |
35 | 35 | ||
36 | #include <asm/mach/dma.h> | 36 | #include <asm/mach/dma.h> |
37 | #include <asm/arch/map.h> | 37 | #include <mach/map.h> |
38 | 38 | ||
39 | #include <asm/plat-s3c24xx/dma.h> | 39 | #include <asm/plat-s3c24xx/dma.h> |
40 | 40 | ||
diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c index ace8bec5de5a..dd27334e3d7e 100644 --- a/arch/arm/plat-s3c24xx/gpio.c +++ b/arch/arm/plat-s3c24xx/gpio.c | |||
@@ -27,11 +27,11 @@ | |||
27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
28 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
29 | 29 | ||
30 | #include <asm/arch/hardware.h> | 30 | #include <mach/hardware.h> |
31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
33 | 33 | ||
34 | #include <asm/arch/regs-gpio.h> | 34 | #include <mach/regs-gpio.h> |
35 | 35 | ||
36 | void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function) | 36 | void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function) |
37 | { | 37 | { |
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 6dd5211c9c67..849f8469714a 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c | |||
@@ -19,10 +19,10 @@ | |||
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
21 | 21 | ||
22 | #include <asm/arch/hardware.h> | 22 | #include <mach/hardware.h> |
23 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
24 | 24 | ||
25 | #include <asm/arch/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
26 | 26 | ||
27 | struct s3c24xx_gpio_chip { | 27 | struct s3c24xx_gpio_chip { |
28 | struct gpio_chip chip; | 28 | struct gpio_chip chip; |
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index f524d765c8aa..36cefe176835 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c | |||
@@ -56,14 +56,14 @@ | |||
56 | #include <linux/ioport.h> | 56 | #include <linux/ioport.h> |
57 | #include <linux/sysdev.h> | 57 | #include <linux/sysdev.h> |
58 | 58 | ||
59 | #include <asm/arch/hardware.h> | 59 | #include <mach/hardware.h> |
60 | #include <asm/irq.h> | 60 | #include <asm/irq.h> |
61 | #include <asm/io.h> | 61 | #include <asm/io.h> |
62 | 62 | ||
63 | #include <asm/mach/irq.h> | 63 | #include <asm/mach/irq.h> |
64 | 64 | ||
65 | #include <asm/arch/regs-irq.h> | 65 | #include <mach/regs-irq.h> |
66 | #include <asm/arch/regs-gpio.h> | 66 | #include <mach/regs-gpio.h> |
67 | 67 | ||
68 | #include <asm/plat-s3c24xx/cpu.h> | 68 | #include <asm/plat-s3c24xx/cpu.h> |
69 | #include <asm/plat-s3c24xx/pm.h> | 69 | #include <asm/plat-s3c24xx/pm.h> |
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c index 9919419e3273..e6705014b2a0 100644 --- a/arch/arm/plat-s3c24xx/pm-simtec.c +++ b/arch/arm/plat-s3c24xx/pm-simtec.c | |||
@@ -24,12 +24,12 @@ | |||
24 | #include <asm/mach/arch.h> | 24 | #include <asm/mach/arch.h> |
25 | #include <asm/mach/map.h> | 25 | #include <asm/mach/map.h> |
26 | 26 | ||
27 | #include <asm/arch/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | 29 | ||
30 | #include <asm/arch/map.h> | 30 | #include <mach/map.h> |
31 | #include <asm/arch/regs-gpio.h> | 31 | #include <mach/regs-gpio.h> |
32 | #include <asm/arch/regs-mem.h> | 32 | #include <mach/regs-mem.h> |
33 | 33 | ||
34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
35 | 35 | ||
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index 0d044bcbe1ac..fc4b731a949c 100644 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c | |||
@@ -37,14 +37,14 @@ | |||
37 | #include <linux/serial_core.h> | 37 | #include <linux/serial_core.h> |
38 | 38 | ||
39 | #include <asm/cacheflush.h> | 39 | #include <asm/cacheflush.h> |
40 | #include <asm/arch/hardware.h> | 40 | #include <mach/hardware.h> |
41 | #include <asm/io.h> | 41 | #include <asm/io.h> |
42 | 42 | ||
43 | #include <asm/plat-s3c/regs-serial.h> | 43 | #include <asm/plat-s3c/regs-serial.h> |
44 | #include <asm/arch/regs-clock.h> | 44 | #include <mach/regs-clock.h> |
45 | #include <asm/arch/regs-gpio.h> | 45 | #include <mach/regs-gpio.h> |
46 | #include <asm/arch/regs-mem.h> | 46 | #include <mach/regs-mem.h> |
47 | #include <asm/arch/regs-irq.h> | 47 | #include <mach/regs-irq.h> |
48 | 48 | ||
49 | #include <asm/mach/time.h> | 49 | #include <asm/mach/time.h> |
50 | 50 | ||
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index 489e32abf3ac..ccfdc9d7ae4b 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
@@ -18,11 +18,11 @@ | |||
18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | 20 | ||
21 | #include <asm/arch/hardware.h> | 21 | #include <mach/hardware.h> |
22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
23 | 23 | ||
24 | #include <asm/arch/regs-clock.h> | 24 | #include <mach/regs-clock.h> |
25 | #include <asm/arch/regs-gpio.h> | 25 | #include <mach/regs-gpio.h> |
26 | 26 | ||
27 | #include <asm/plat-s3c24xx/clock.h> | 27 | #include <asm/plat-s3c24xx/clock.h> |
28 | #include <asm/plat-s3c24xx/cpu.h> | 28 | #include <asm/plat-s3c24xx/cpu.h> |
diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c index a811e8b6d455..8a5fffde6631 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-clock.c +++ b/arch/arm/plat-s3c24xx/s3c244x-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/arch/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/plat-s3c24xx/s3c244x-irq.c b/arch/arm/plat-s3c24xx/s3c244x-irq.c index 2eefe16bd2a8..f3dc38cf1de4 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-irq.c +++ b/arch/arm/plat-s3c24xx/s3c244x-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/arch/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/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index eb9dd4f9b8ec..281b4804ed38 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c | |||
@@ -25,15 +25,15 @@ | |||
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/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 | ||
32 | #include <asm/arch/regs-clock.h> | 32 | #include <mach/regs-clock.h> |
33 | #include <asm/plat-s3c/regs-serial.h> | 33 | #include <asm/plat-s3c/regs-serial.h> |
34 | #include <asm/arch/regs-gpio.h> | 34 | #include <mach/regs-gpio.h> |
35 | #include <asm/arch/regs-gpioj.h> | 35 | #include <mach/regs-gpioj.h> |
36 | #include <asm/arch/regs-dsc.h> | 36 | #include <mach/regs-dsc.h> |
37 | 37 | ||
38 | #include <asm/plat-s3c24xx/s3c2410.h> | 38 | #include <asm/plat-s3c24xx/s3c2410.h> |
39 | #include <asm/plat-s3c24xx/s3c2440.h> | 39 | #include <asm/plat-s3c24xx/s3c2440.h> |
diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S index 4f8756e19bb1..4981a08b6ebb 100644 --- a/arch/arm/plat-s3c24xx/sleep.S +++ b/arch/arm/plat-s3c24xx/sleep.S | |||
@@ -26,12 +26,12 @@ | |||
26 | 26 | ||
27 | #include <linux/linkage.h> | 27 | #include <linux/linkage.h> |
28 | #include <asm/assembler.h> | 28 | #include <asm/assembler.h> |
29 | #include <asm/arch/hardware.h> | 29 | #include <mach/hardware.h> |
30 | #include <asm/arch/map.h> | 30 | #include <mach/map.h> |
31 | 31 | ||
32 | #include <asm/arch/regs-gpio.h> | 32 | #include <mach/regs-gpio.h> |
33 | #include <asm/arch/regs-clock.h> | 33 | #include <mach/regs-clock.h> |
34 | #include <asm/arch/regs-mem.h> | 34 | #include <mach/regs-mem.h> |
35 | #include <asm/plat-s3c/regs-serial.h> | 35 | #include <asm/plat-s3c/regs-serial.h> |
36 | 36 | ||
37 | /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not | 37 | /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not |
diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c index 766473b3f98b..b471a21ae2e4 100644 --- a/arch/arm/plat-s3c24xx/time.c +++ b/arch/arm/plat-s3c24xx/time.c | |||
@@ -32,9 +32,9 @@ | |||
32 | 32 | ||
33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
35 | #include <asm/arch/map.h> | 35 | #include <mach/map.h> |
36 | #include <asm/plat-s3c/regs-timer.h> | 36 | #include <asm/plat-s3c/regs-timer.h> |
37 | #include <asm/arch/regs-irq.h> | 37 | #include <mach/regs-irq.h> |
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | 39 | ||
40 | #include <asm/plat-s3c24xx/clock.h> | 40 | #include <asm/plat-s3c24xx/clock.h> |