[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>
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/plat-s3c24xx
parent: 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff)
15 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c
index 3ac8d8d781b3..373d04358485 100644
--- a/arch/arm/plat-s3c24xx/clock.c
+++ b/arch/arm/plat-s3c24xx/clock.c
@@ -40,7 +40,7 @@
 #include <linux/mutex.h>
 #include <linux/delay.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c
index 398c7ac25296..a608aa388820 100644
--- a/arch/arm/plat-s3c24xx/common-smdk.c
+++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -31,7 +31,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index f5699cadb0c3..05a1d9cc280c 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/delay.h>
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index eea3b32ff798..5c6f446a1fa9 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -24,7 +24,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 #include <asm/arch/fb.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 8c5e656d5d8c..8ae5719d6b3b 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -29,7 +29,7 @@
 #include <asm/system.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/dma.h>
diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c
index ee99dcc7f0bd..ace8bec5de5a 100644
--- a/arch/arm/plat-s3c24xx/gpio.c
+++ b/arch/arm/plat-s3c24xx/gpio.c
@@ -27,7 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c
index 825d8d0c5ca2..6dd5211c9c67 100644
--- a/arch/arm/plat-s3c24xx/gpiolib.c
+++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -19,7 +19,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/arch/regs-gpio.h>
diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
index 001436c04b13..f524d765c8aa 100644
--- a/arch/arm/plat-s3c24xx/irq.c
+++ b/arch/arm/plat-s3c24xx/irq.c
@@ -56,7 +56,7 @@
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c
index cb0b3a4ccf1b..9919419e3273 100644
--- a/arch/arm/plat-s3c24xx/pm-simtec.c
+++ b/arch/arm/plat-s3c24xx/pm-simtec.c
@@ -24,7 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/arch/map.h>
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
index bf5581a9aeea..0d044bcbe1ac 100644
--- a/arch/arm/plat-s3c24xx/pm.c
+++ b/arch/arm/plat-s3c24xx/pm.c
@@ -37,7 +37,7 @@
 #include <linux/serial_core.h>
 #include <asm/cacheflush.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/plat-s3c/regs-serial.h>
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c
index 2cda3e3c6786..489e32abf3ac 100644
--- a/arch/arm/plat-s3c24xx/pwm-clock.c
+++ b/arch/arm/plat-s3c24xx/pwm-clock.c
@@ -18,7 +18,7 @@
 #include <linux/err.h>
 #include <linux/io.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/arch/regs-clock.h>
diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c
index faf3e0f9f4e2..a811e8b6d455 100644
--- a/arch/arm/plat-s3c24xx/s3c244x-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c244x-clock.c
@@ -34,7 +34,7 @@
 #include <linux/mutex.h>
 #include <linux/clk.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/atomic.h>
 #include <asm/irq.h>
 #include <asm/io.h>
diff --git a/arch/arm/plat-s3c24xx/s3c244x-irq.c b/arch/arm/plat-s3c24xx/s3c244x-irq.c
index 2dbb2606d448..2eefe16bd2a8 100644
--- a/arch/arm/plat-s3c24xx/s3c244x-irq.c
+++ b/arch/arm/plat-s3c24xx/s3c244x-irq.c
@@ -25,7 +25,7 @@
 #include <linux/ioport.h>
 #include <linux/sysdev.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
index 2f01af5f64c4..eb9dd4f9b8ec 100644
--- a/arch/arm/plat-s3c24xx/s3c244x.c
+++ b/arch/arm/plat-s3c24xx/s3c244x.c
@@ -25,7 +25,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S
index a646cbe8244c..4f8756e19bb1 100644
--- a/arch/arm/plat-s3c24xx/sleep.S
+++ b/arch/arm/plat-s3c24xx/sleep.S
@@ -26,7 +26,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/map.h>
 #include <asm/arch/regs-gpio.h>
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/plat-s3c24xx
parent	0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff)

diff --git a/arch/arm/plat-s3c24xx/clock.c b/arch/arm/plat-s3c24xx/clock.c index 3ac8d8d781b3..373d04358485 100644 --- a/arch/arm/plat-s3c24xx/clock.c +++ b/arch/arm/plat-s3c24xx/clock.c
@@ -40,7 +40,7 @@
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/hardware.h>	43	#include <asm/arch/hardware.h>
44	#include <asm/irq.h>	44	#include <asm/irq.h>
45	#include <asm/io.h>	45	#include <asm/io.h>
46		46


diff --git a/arch/arm/plat-s3c24xx/common-smdk.c b/arch/arm/plat-s3c24xx/common-smdk.c index 398c7ac25296..a608aa388820 100644 --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c
@@ -31,7 +31,7 @@
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/hardware.h>	34	#include <asm/arch/hardware.h>
35	#include <asm/io.h>	35	#include <asm/io.h>
36	#include <asm/irq.h>	36	#include <asm/irq.h>
37		37


diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c index f5699cadb0c3..05a1d9cc280c 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/hardware.h>	33	#include <asm/arch/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>


diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index eea3b32ff798..5c6f446a1fa9 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.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	#include <asm/arch/fb.h>	26	#include <asm/arch/fb.h>
27	#include <asm/hardware.h>	27	#include <asm/arch/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 8c5e656d5d8c..8ae5719d6b3b 100644 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c
@@ -29,7 +29,7 @@
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/hardware.h>	32	#include <asm/arch/hardware.h>
33	#include <asm/io.h>	33	#include <asm/io.h>
34	#include <asm/dma.h>	34	#include <asm/dma.h>
35		35


diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c index ee99dcc7f0bd..ace8bec5de5a 100644 --- a/arch/arm/plat-s3c24xx/gpio.c +++ b/arch/arm/plat-s3c24xx/gpio.c
@@ -27,7 +27,7 @@
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/hardware.h>	30	#include <asm/arch/hardware.h>
31	#include <asm/irq.h>	31	#include <asm/irq.h>
32	#include <asm/io.h>	32	#include <asm/io.h>
33		33


diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 825d8d0c5ca2..6dd5211c9c67 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -19,7 +19,7 @@
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/hardware.h>	22	#include <asm/arch/hardware.h>
23	#include <asm/irq.h>	23	#include <asm/irq.h>
24		24
25	#include <asm/arch/regs-gpio.h>	25	#include <asm/arch/regs-gpio.h>


diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c index 001436c04b13..f524d765c8aa 100644 --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c
@@ -56,7 +56,7 @@
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/hardware.h>	59	#include <asm/arch/hardware.h>
60	#include <asm/irq.h>	60	#include <asm/irq.h>
61	#include <asm/io.h>	61	#include <asm/io.h>
62		62


diff --git a/arch/arm/plat-s3c24xx/pm-simtec.c b/arch/arm/plat-s3c24xx/pm-simtec.c index cb0b3a4ccf1b..9919419e3273 100644 --- a/arch/arm/plat-s3c24xx/pm-simtec.c +++ b/arch/arm/plat-s3c24xx/pm-simtec.c
@@ -24,7 +24,7 @@
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/hardware.h>	27	#include <asm/arch/hardware.h>
28	#include <asm/io.h>	28	#include <asm/io.h>
29		29
30	#include <asm/arch/map.h>	30	#include <asm/arch/map.h>


diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index bf5581a9aeea..0d044bcbe1ac 100644 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c
@@ -37,7 +37,7 @@
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/hardware.h>	40	#include <asm/arch/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>


diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index 2cda3e3c6786..489e32abf3ac 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c
@@ -18,7 +18,7 @@
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/hardware.h>	21	#include <asm/arch/hardware.h>
22	#include <asm/irq.h>	22	#include <asm/irq.h>
23		23
24	#include <asm/arch/regs-clock.h>	24	#include <asm/arch/regs-clock.h>


diff --git a/arch/arm/plat-s3c24xx/s3c244x-clock.c b/arch/arm/plat-s3c24xx/s3c244x-clock.c index faf3e0f9f4e2..a811e8b6d455 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-clock.c +++ b/arch/arm/plat-s3c24xx/s3c244x-clock.c
@@ -34,7 +34,7 @@
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 <asm/arch/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>


diff --git a/arch/arm/plat-s3c24xx/s3c244x-irq.c b/arch/arm/plat-s3c24xx/s3c244x-irq.c index 2dbb2606d448..2eefe16bd2a8 100644 --- a/arch/arm/plat-s3c24xx/s3c244x-irq.c +++ b/arch/arm/plat-s3c24xx/s3c244x-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/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c index 2f01af5f64c4..eb9dd4f9b8ec 100644 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.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/io.h>	29	#include <asm/io.h>
30	#include <asm/irq.h>	30	#include <asm/irq.h>
31		31


diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S index a646cbe8244c..4f8756e19bb1 100644 --- a/arch/arm/plat-s3c24xx/sleep.S +++ b/arch/arm/plat-s3c24xx/sleep.S
@@ -26,7 +26,7 @@
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/hardware.h>	29	#include <asm/arch/hardware.h>
30	#include <asm/arch/map.h>	30	#include <asm/arch/map.h>
31		31
32	#include <asm/arch/regs-gpio.h>	32	#include <asm/arch/regs-gpio.h>