[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/mach-ixp4xx
parent: 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff)
15 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c
index c6e044befccb..8d549daba1e9 100644
--- a/arch/arm/mach-ixp4xx/avila-pci.c
+++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -25,7 +25,7 @@
 #include <asm/mach/pci.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach-types.h>
 void __init avila_pci_preinit(void)
diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c
index e38f45fa58ae..87e38ca18a27 100644
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -23,7 +23,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index 64be341109b3..3b32f7014bf6 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -32,7 +32,7 @@
 #include <asm/sizes.h>
 #include <asm/system.h>
 #include <asm/mach/pci.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 /*
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 3947c506b4f3..00cede2b7a42 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -30,7 +30,7 @@
 #include <linux/clockchips.h>
 #include <asm/arch/udc.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c
index be4f4a208b90..6dd400f55e44 100644
--- a/arch/arm/mach-ixp4xx/coyote-pci.c
+++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -20,7 +20,7 @@
 #include <linux/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 13f8a7ac3ba9..66acd55346cb 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -19,7 +19,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c
index afd1dc14e597..07ee00c05edd 100644
--- a/arch/arm/mach-ixp4xx/gateway7001-pci.c
+++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -23,7 +23,7 @@
 #include <linux/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach/pci.h>
diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c
index 37876832e141..80044e8b90b2 100644
--- a/arch/arm/mach-ixp4xx/gateway7001-setup.c
+++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -22,7 +22,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
index 20960704183b..241bb5f2f424 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -28,7 +28,7 @@
 #include <linux/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/arch/gtwx5715.h>
 #include <asm/mach/pci.h>
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index dc6725bda3c4..ef21bfb3359a 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -32,7 +32,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index 7d9bb4d23104..9ec957196c70 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -22,7 +22,7 @@
 #include <asm/mach/pci.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach-types.h>
 void __init ixdp425_pci_preinit(void)
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 44584afb34a3..8666a428f9be 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -24,7 +24,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
index 37d9f2e8f602..fac9e5cdab20 100644
--- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -19,7 +19,7 @@
 #include <linux/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach/pci.h>
diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c
index 0f00feab67f8..0fd513af9a45 100644
--- a/arch/arm/mach-ixp4xx/wg302v2-pci.c
+++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -23,7 +23,7 @@
 #include <linux/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/mach/pci.h>
diff --git a/arch/arm/mach-ixp4xx/wg302v2-setup.c b/arch/arm/mach-ixp4xx/wg302v2-setup.c
index f7e09ad804e8..c426dcb5b9b3 100644
--- a/arch/arm/mach-ixp4xx/wg302v2-setup.c
+++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -23,7 +23,7 @@
 #include <asm/types.h>
 #include <asm/setup.h>
 #include <asm/memory.h>
-#include <asm/hardware.h>
+#include <asm/arch/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.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/mach-ixp4xx
parent	0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff)

diff --git a/arch/arm/mach-ixp4xx/avila-pci.c b/arch/arm/mach-ixp4xx/avila-pci.c index c6e044befccb..8d549daba1e9 100644 --- a/arch/arm/mach-ixp4xx/avila-pci.c +++ b/arch/arm/mach-ixp4xx/avila-pci.c
@@ -25,7 +25,7 @@
25		25
26	#include <asm/mach/pci.h>	26	#include <asm/mach/pci.h>
27	#include <asm/irq.h>	27	#include <asm/irq.h>
28	#include <asm/hardware.h>	28	#include <asm/arch/hardware.h>
29	#include <asm/mach-types.h>	29	#include <asm/mach-types.h>
30		30
31	void __init avila_pci_preinit(void)	31	void __init avila_pci_preinit(void)


diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c index e38f45fa58ae..87e38ca18a27 100644 --- a/arch/arm/mach-ixp4xx/avila-setup.c +++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -23,7 +23,7 @@
23	#include <asm/types.h>	23	#include <asm/types.h>
24	#include <asm/setup.h>	24	#include <asm/setup.h>
25	#include <asm/memory.h>	25	#include <asm/memory.h>
26	#include <asm/hardware.h>	26	#include <asm/arch/hardware.h>
27	#include <asm/mach-types.h>	27	#include <asm/mach-types.h>
28	#include <asm/irq.h>	28	#include <asm/irq.h>
29	#include <asm/mach/arch.h>	29	#include <asm/mach/arch.h>


diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index 64be341109b3..3b32f7014bf6 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -32,7 +32,7 @@
32	#include <asm/sizes.h>	32	#include <asm/sizes.h>
33	#include <asm/system.h>	33	#include <asm/system.h>
34	#include <asm/mach/pci.h>	34	#include <asm/mach/pci.h>
35	#include <asm/hardware.h>	35	#include <asm/arch/hardware.h>
36		36
37		37
38	/*	38	/*


diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 3947c506b4f3..00cede2b7a42 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c
@@ -30,7 +30,7 @@
30	#include <linux/clockchips.h>	30	#include <linux/clockchips.h>
31		31
32	#include <asm/arch/udc.h>	32	#include <asm/arch/udc.h>
33	#include <asm/hardware.h>	33	#include <asm/arch/hardware.h>
34	#include <asm/uaccess.h>	34	#include <asm/uaccess.h>
35	#include <asm/io.h>	35	#include <asm/io.h>
36	#include <asm/pgtable.h>	36	#include <asm/pgtable.h>


diff --git a/arch/arm/mach-ixp4xx/coyote-pci.c b/arch/arm/mach-ixp4xx/coyote-pci.c index be4f4a208b90..6dd400f55e44 100644 --- a/arch/arm/mach-ixp4xx/coyote-pci.c +++ b/arch/arm/mach-ixp4xx/coyote-pci.c
@@ -20,7 +20,7 @@
20	#include <linux/irq.h>	20	#include <linux/irq.h>
21		21
22	#include <asm/mach-types.h>	22	#include <asm/mach-types.h>
23	#include <asm/hardware.h>	23	#include <asm/arch/hardware.h>
24	#include <asm/irq.h>	24	#include <asm/irq.h>
25		25
26	#include <asm/mach/pci.h>	26	#include <asm/mach/pci.h>


diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 13f8a7ac3ba9..66acd55346cb 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -19,7 +19,7 @@
19	#include <asm/types.h>	19	#include <asm/types.h>
20	#include <asm/setup.h>	20	#include <asm/setup.h>
21	#include <asm/memory.h>	21	#include <asm/memory.h>
22	#include <asm/hardware.h>	22	#include <asm/arch/hardware.h>
23	#include <asm/irq.h>	23	#include <asm/irq.h>
24	#include <asm/mach-types.h>	24	#include <asm/mach-types.h>
25	#include <asm/mach/arch.h>	25	#include <asm/mach/arch.h>


diff --git a/arch/arm/mach-ixp4xx/gateway7001-pci.c b/arch/arm/mach-ixp4xx/gateway7001-pci.c index afd1dc14e597..07ee00c05edd 100644 --- a/arch/arm/mach-ixp4xx/gateway7001-pci.c +++ b/arch/arm/mach-ixp4xx/gateway7001-pci.c
@@ -23,7 +23,7 @@
23	#include <linux/irq.h>	23	#include <linux/irq.h>
24		24
25	#include <asm/mach-types.h>	25	#include <asm/mach-types.h>
26	#include <asm/hardware.h>	26	#include <asm/arch/hardware.h>
27		27
28	#include <asm/mach/pci.h>	28	#include <asm/mach/pci.h>
29		29


diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c index 37876832e141..80044e8b90b2 100644 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c
@@ -22,7 +22,7 @@
22	#include <asm/types.h>	22	#include <asm/types.h>
23	#include <asm/setup.h>	23	#include <asm/setup.h>
24	#include <asm/memory.h>	24	#include <asm/memory.h>
25	#include <asm/hardware.h>	25	#include <asm/arch/hardware.h>
26	#include <asm/irq.h>	26	#include <asm/irq.h>
27	#include <asm/mach-types.h>	27	#include <asm/mach-types.h>
28	#include <asm/mach/arch.h>	28	#include <asm/mach/arch.h>


diff --git a/arch/arm/mach-ixp4xx/gtwx5715-pci.c b/arch/arm/mach-ixp4xx/gtwx5715-pci.c index 20960704183b..241bb5f2f424 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-pci.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-pci.c
@@ -28,7 +28,7 @@
28	#include <linux/irq.h>	28	#include <linux/irq.h>
29		29
30	#include <asm/mach-types.h>	30	#include <asm/mach-types.h>
31	#include <asm/hardware.h>	31	#include <asm/arch/hardware.h>
32	#include <asm/arch/gtwx5715.h>	32	#include <asm/arch/gtwx5715.h>
33	#include <asm/mach/pci.h>	33	#include <asm/mach/pci.h>
34		34


diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index dc6725bda3c4..ef21bfb3359a 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -32,7 +32,7 @@
32	#include <asm/types.h>	32	#include <asm/types.h>
33	#include <asm/setup.h>	33	#include <asm/setup.h>
34	#include <asm/memory.h>	34	#include <asm/memory.h>
35	#include <asm/hardware.h>	35	#include <asm/arch/hardware.h>
36	#include <asm/irq.h>	36	#include <asm/irq.h>
37	#include <asm/mach-types.h>	37	#include <asm/mach-types.h>
38	#include <asm/mach/arch.h>	38	#include <asm/mach/arch.h>


diff --git a/arch/arm/mach-ixp4xx/ixdp425-pci.c b/arch/arm/mach-ixp4xx/ixdp425-pci.c index 7d9bb4d23104..9ec957196c70 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -22,7 +22,7 @@
22		22
23	#include <asm/mach/pci.h>	23	#include <asm/mach/pci.h>
24	#include <asm/irq.h>	24	#include <asm/irq.h>
25	#include <asm/hardware.h>	25	#include <asm/arch/hardware.h>
26	#include <asm/mach-types.h>	26	#include <asm/mach-types.h>
27		27
28	void __init ixdp425_pci_preinit(void)	28	void __init ixdp425_pci_preinit(void)


diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 44584afb34a3..8666a428f9be 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -24,7 +24,7 @@
24	#include <asm/types.h>	24	#include <asm/types.h>
25	#include <asm/setup.h>	25	#include <asm/setup.h>
26	#include <asm/memory.h>	26	#include <asm/memory.h>
27	#include <asm/hardware.h>	27	#include <asm/arch/hardware.h>
28	#include <asm/mach-types.h>	28	#include <asm/mach-types.h>
29	#include <asm/irq.h>	29	#include <asm/irq.h>
30	#include <asm/mach/arch.h>	30	#include <asm/mach/arch.h>


diff --git a/arch/arm/mach-ixp4xx/ixdpg425-pci.c b/arch/arm/mach-ixp4xx/ixdpg425-pci.c index 37d9f2e8f602..fac9e5cdab20 100644 --- a/arch/arm/mach-ixp4xx/ixdpg425-pci.c +++ b/arch/arm/mach-ixp4xx/ixdpg425-pci.c
@@ -19,7 +19,7 @@
19	#include <linux/irq.h>	19	#include <linux/irq.h>
20		20
21	#include <asm/mach-types.h>	21	#include <asm/mach-types.h>
22	#include <asm/hardware.h>	22	#include <asm/arch/hardware.h>
23		23
24	#include <asm/mach/pci.h>	24	#include <asm/mach/pci.h>
25		25


diff --git a/arch/arm/mach-ixp4xx/wg302v2-pci.c b/arch/arm/mach-ixp4xx/wg302v2-pci.c index 0f00feab67f8..0fd513af9a45 100644 --- a/arch/arm/mach-ixp4xx/wg302v2-pci.c +++ b/arch/arm/mach-ixp4xx/wg302v2-pci.c
@@ -23,7 +23,7 @@
23	#include <linux/irq.h>	23	#include <linux/irq.h>
24		24
25	#include <asm/mach-types.h>	25	#include <asm/mach-types.h>
26	#include <asm/hardware.h>	26	#include <asm/arch/hardware.h>
27		27
28	#include <asm/mach/pci.h>	28	#include <asm/mach/pci.h>
29		29


diff --git a/arch/arm/mach-ixp4xx/wg302v2-setup.c b/arch/arm/mach-ixp4xx/wg302v2-setup.c index f7e09ad804e8..c426dcb5b9b3 100644 --- a/arch/arm/mach-ixp4xx/wg302v2-setup.c +++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c
@@ -23,7 +23,7 @@
23	#include <asm/types.h>	23	#include <asm/types.h>
24	#include <asm/setup.h>	24	#include <asm/setup.h>
25	#include <asm/memory.h>	25	#include <asm/memory.h>
26	#include <asm/hardware.h>	26	#include <asm/arch/hardware.h>
27	#include <asm/irq.h>	27	#include <asm/irq.h>
28	#include <asm/mach-types.h>	28	#include <asm/mach-types.h>
29	#include <asm/mach/arch.h>	29	#include <asm/mach/arch.h>