diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-04 05:41:28 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:40:08 -0400 |
commit | be509729356b7433f73df2b9a966674a437fbbc1 (patch) | |
tree | 5a3e90513c106f9dcf08405e4ebd3599fd14413c /arch/arm/mach-s3c2412 | |
parent | 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff) |
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2412')
-rw-r--r-- | arch/arm/mach-s3c2412/clock.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/gpio.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-smdk2413.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/mach-vstms.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/s3c2412.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2412/sleep.S | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 1157b5a16263..b1552b2e8ea8 100644 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
36 | 36 | ||
37 | #include <asm/hardware.h> | 37 | #include <asm/arch/hardware.h> |
38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
39 | 39 | ||
40 | #include <asm/plat-s3c/regs-serial.h> | 40 | #include <asm/plat-s3c/regs-serial.h> |
diff --git a/arch/arm/mach-s3c2412/gpio.c b/arch/arm/mach-s3c2412/gpio.c index 8e55c3a2eab8..4f86693b05fd 100644 --- a/arch/arm/mach-s3c2412/gpio.c +++ b/arch/arm/mach-s3c2412/gpio.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include <asm/arch/regs-gpio.h> | 23 | #include <asm/arch/regs-gpio.h> |
24 | 24 | ||
25 | #include <asm/hardware.h> | 25 | #include <asm/arch/hardware.h> |
26 | 26 | ||
27 | int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) | 27 | int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state) |
28 | { | 28 | { |
diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c index cc1917bf952a..0230b2f6353a 100644 --- a/arch/arm/mach-s3c2412/irq.c +++ b/arch/arm/mach-s3c2412/irq.c | |||
@@ -25,7 +25,7 @@ | |||
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 <asm/arch/hardware.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | 31 | ||
diff --git a/arch/arm/mach-s3c2412/mach-smdk2413.c b/arch/arm/mach-s3c2412/mach-smdk2413.c index b126a530daa6..d7d0e95949c5 100644 --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c | |||
@@ -24,7 +24,7 @@ | |||
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 | 26 | ||
27 | #include <asm/hardware.h> | 27 | #include <asm/arch/hardware.h> |
28 | #include <asm/hardware/iomd.h> | 28 | #include <asm/hardware/iomd.h> |
29 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
diff --git a/arch/arm/mach-s3c2412/mach-vstms.c b/arch/arm/mach-s3c2412/mach-vstms.c index 32982547cd63..d7087d0dbad2 100644 --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c | |||
@@ -27,7 +27,7 @@ | |||
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 <asm/arch/hardware.h> |
31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index d4ffb2d98076..a71d6c6cd447 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/sysdev.h> | 19 | #include <linux/sysdev.h> |
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | 21 | ||
22 | #include <asm/hardware.h> | 22 | #include <asm/arch/hardware.h> |
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | #include <asm/irq.h> | 24 | #include <asm/irq.h> |
25 | 25 | ||
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c index 98a0de924c22..5ce001b5c275 100644 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.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 <asm/arch/hardware.h> |
29 | #include <asm/proc-fns.h> | 29 | #include <asm/proc-fns.h> |
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
diff --git a/arch/arm/mach-s3c2412/sleep.S b/arch/arm/mach-s3c2412/sleep.S index db32cac4199a..609312b62023 100644 --- a/arch/arm/mach-s3c2412/sleep.S +++ b/arch/arm/mach-s3c2412/sleep.S | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | #include <linux/linkage.h> | 23 | #include <linux/linkage.h> |
24 | #include <asm/assembler.h> | 24 | #include <asm/assembler.h> |
25 | #include <asm/hardware.h> | 25 | #include <asm/arch/hardware.h> |
26 | #include <asm/arch/map.h> | 26 | #include <asm/arch/map.h> |
27 | 27 | ||
28 | #include <asm/arch/regs-irq.h> | 28 | #include <asm/arch/regs-irq.h> |