diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-03 10:06:16 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:40:04 -0400 |
commit | 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (patch) | |
tree | 4f922bf707c379352eb4c077fbb0a8c48c07fc1f | |
parent | 897d85275d7f061ff0ec838bd5224a9e76ad07d6 (diff) |
[ARM] Eliminate useless includes of asm/mach-types.h
There are 43 includes of asm/mach-types.h by files that don't
reference anything from that file. Remove these unnecessary
includes.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
43 files changed, 0 insertions, 43 deletions
diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index dd3fbd6766e1..aa5ee49c5c5a 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S | |||
@@ -6,7 +6,6 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/linkage.h> | 8 | #include <linux/linkage.h> |
9 | #include <asm/mach-types.h> | ||
10 | 9 | ||
11 | .section ".start", "ax" | 10 | .section ".start", "ax" |
12 | 11 | ||
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 8822b684d474..7a1f9e3581fd 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <linux/suspend.h> | 27 | #include <linux/suspend.h> |
28 | 28 | ||
29 | #include <asm/hardware.h> | 29 | #include <asm/hardware.h> |
30 | #include <asm/mach-types.h> | ||
31 | #include <asm/irq.h> | 30 | #include <asm/irq.h> |
32 | #include <asm/arch/pm.h> | 31 | #include <asm/arch/pm.h> |
33 | #include <asm/arch/pxa-regs.h> | 32 | #include <asm/arch/pxa-regs.h> |
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 5d78ffb8a9a7..27329bd32037 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | 16 | ||
17 | #include <asm/assembler.h> | 17 | #include <asm/assembler.h> |
18 | #include <asm/mach-types.h> | ||
19 | #include <asm/ptrace.h> | 18 | #include <asm/ptrace.h> |
20 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |
21 | #include <asm/thread_info.h> | 20 | #include <asm/thread_info.h> |
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index 464bdbbf74df..3ce0012928c4 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | 25 | ||
26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
27 | #include <asm/mach-types.h> | ||
28 | 27 | ||
29 | #include <asm/hardware.h> | 28 | #include <asm/hardware.h> |
30 | #include <asm/arch/at91_pmc.h> | 29 | #include <asm/arch/at91_pmc.h> |
diff --git a/arch/arm/mach-at91/irq.c b/arch/arm/mach-at91/irq.c index ca87587b2b4b..fc059ec4b021 100644 --- a/arch/arm/mach-at91/irq.c +++ b/arch/arm/mach-at91/irq.c | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include <asm/hardware.h> | 28 | #include <asm/hardware.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | #include <asm/mach-types.h> | ||
31 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
32 | 31 | ||
33 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
diff --git a/arch/arm/mach-at91/leds.c b/arch/arm/mach-at91/leds.c index 9cdcda500fe8..f064b7acb011 100644 --- a/arch/arm/mach-at91/leds.c +++ b/arch/arm/mach-at91/leds.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | 15 | ||
16 | #include <asm/mach-types.h> | ||
17 | #include <asm/arch/board.h> | 16 | #include <asm/arch/board.h> |
18 | #include <asm/arch/gpio.h> | 17 | #include <asm/arch/gpio.h> |
19 | 18 | ||
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 8ab4feb1ec5b..a5cfe866c9dd 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include <asm/atomic.h> | 23 | #include <asm/atomic.h> |
24 | #include <asm/mach/time.h> | 24 | #include <asm/mach/time.h> |
25 | #include <asm/mach/irq.h> | 25 | #include <asm/mach/irq.h> |
26 | #include <asm/mach-types.h> | ||
27 | 26 | ||
28 | #include <asm/arch/at91_pmc.h> | 27 | #include <asm/arch/at91_pmc.h> |
29 | #include <asm/arch/gpio.h> | 28 | #include <asm/arch/gpio.h> |
diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c index 69f07b25b3c9..cffd06530781 100644 --- a/arch/arm/mach-iop13xx/irq.c +++ b/arch/arm/mach-iop13xx/irq.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <asm/mach/irq.h> | 24 | #include <asm/mach/irq.h> |
25 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
26 | #include <asm/hardware.h> | 26 | #include <asm/hardware.h> |
27 | #include <asm/mach-types.h> | ||
28 | #include <asm/arch/irqs.h> | 27 | #include <asm/arch/irqs.h> |
29 | #include <asm/arch/msi.h> | 28 | #include <asm/arch/msi.h> |
30 | 29 | ||
diff --git a/arch/arm/mach-iop33x/uart.c b/arch/arm/mach-iop33x/uart.c index ac297cd0276c..46318665f0dc 100644 --- a/arch/arm/mach-iop33x/uart.c +++ b/arch/arm/mach-iop33x/uart.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/memory.h> | 26 | #include <asm/memory.h> |
27 | #include <asm/hardware.h> | 27 | #include <asm/hardware.h> |
28 | #include <asm/hardware/iop3xx.h> | 28 | #include <asm/hardware/iop3xx.h> |
29 | #include <asm/mach-types.h> | ||
30 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
31 | 30 | ||
32 | #define IOP33X_UART_XTAL 33334000 | 31 | #define IOP33X_UART_XTAL 33334000 |
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index df16a4eac490..9a1f18ddd3eb 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -33,7 +33,6 @@ | |||
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/hardware.h> |
36 | #include <asm/mach-types.h> | ||
37 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
38 | #include <asm/system.h> | 37 | #include <asm/system.h> |
39 | #include <asm/tlbflush.h> | 38 | #include <asm/tlbflush.h> |
diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c index 227f808dc0ec..db24c43449d7 100644 --- a/arch/arm/mach-ixp23xx/pci.c +++ b/arch/arm/mach-ixp23xx/pci.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <asm/sizes.h> | 31 | #include <asm/sizes.h> |
32 | #include <asm/system.h> | 32 | #include <asm/system.h> |
33 | #include <asm/mach/pci.h> | 33 | #include <asm/mach/pci.h> |
34 | #include <asm/mach-types.h> | ||
35 | #include <asm/hardware.h> | 34 | #include <asm/hardware.h> |
36 | 35 | ||
37 | extern int (*external_fault) (unsigned long, struct pt_regs *); | 36 | extern int (*external_fault) (unsigned long, struct pt_regs *); |
diff --git a/arch/arm/mach-ks8695/leds.c b/arch/arm/mach-ks8695/leds.c index d61762ae50d8..17c5ef13b0d1 100644 --- a/arch/arm/mach-ks8695/leds.c +++ b/arch/arm/mach-ks8695/leds.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | 14 | ||
15 | #include <asm/mach-types.h> | ||
16 | #include <asm/leds.h> | 15 | #include <asm/leds.h> |
17 | #include <asm/arch/devices.h> | 16 | #include <asm/arch/devices.h> |
18 | #include <asm/arch/gpio.h> | 17 | #include <asm/arch/gpio.h> |
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index 0a29ef29c73a..4af6f4f06e82 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include <asm/arch/clock.h> | 25 | #include <asm/arch/clock.h> |
26 | #include <asm/arch/common.h> | 26 | #include <asm/arch/common.h> |
27 | #include <asm/div64.h> | 27 | #include <asm/div64.h> |
28 | #include <asm/mach-types.h> | ||
29 | 28 | ||
30 | #include "crm_regs.h" | 29 | #include "crm_regs.h" |
31 | 30 | ||
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c index 028ac4d33684..ede77f7e6c15 100644 --- a/arch/arm/mach-mx2/pcm970-baseboard.c +++ b/arch/arm/mach-mx2/pcm970-baseboard.c | |||
@@ -18,7 +18,6 @@ | |||
18 | 18 | ||
19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
20 | #include <asm/hardware.h> | 20 | #include <asm/hardware.h> |
21 | #include <asm/mach-types.h> | ||
22 | #include <asm/mach/arch.h> | 21 | #include <asm/mach/arch.h> |
23 | 22 | ||
24 | /* | 23 | /* |
diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c index d2964257797e..96de8ebed41d 100644 --- a/arch/arm/mach-ns9xxx/irq.c +++ b/arch/arm/mach-ns9xxx/irq.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <linux/kernel_stat.h> | 12 | #include <linux/kernel_stat.h> |
13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
14 | #include <asm/mach/irq.h> | 14 | #include <asm/mach/irq.h> |
15 | #include <asm/mach-types.h> | ||
16 | #include <asm/arch/regs-sys-common.h> | 15 | #include <asm/arch/regs-sys-common.h> |
17 | #include <asm/arch/irqs.h> | 16 | #include <asm/arch/irqs.h> |
18 | #include <asm/arch/board.h> | 17 | #include <asm/arch/board.h> |
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index da8a3ac47e13..88b4b979a8bc 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <asm/hardware.h> | 17 | #include <asm/hardware.h> |
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | #include <asm/mach-types.h> | ||
20 | #include <asm/mach/map.h> | 19 | #include <asm/mach/map.h> |
21 | 20 | ||
22 | #include <asm/arch/tc.h> | 21 | #include <asm/arch/tc.h> |
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index 742f79e73bd7..bb06de92daee 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <asm/atomic.h> | 47 | #include <asm/atomic.h> |
48 | #include <asm/mach/time.h> | 48 | #include <asm/mach/time.h> |
49 | #include <asm/mach/irq.h> | 49 | #include <asm/mach/irq.h> |
50 | #include <asm/mach-types.h> | ||
51 | 50 | ||
52 | #include <asm/arch/cpu.h> | 51 | #include <asm/arch/cpu.h> |
53 | #include <asm/arch/irqs.h> | 52 | #include <asm/arch/irqs.h> |
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index d6c9de82ca0c..5e6e595d8eff 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <asm/atomic.h> | 30 | #include <asm/atomic.h> |
31 | #include <asm/mach/time.h> | 31 | #include <asm/mach/time.h> |
32 | #include <asm/mach/irq.h> | 32 | #include <asm/mach/irq.h> |
33 | #include <asm/mach-types.h> | ||
34 | 33 | ||
35 | #include <asm/arch/irqs.h> | 34 | #include <asm/arch/irqs.h> |
36 | #include <asm/arch/clock.h> | 35 | #include <asm/arch/clock.h> |
diff --git a/arch/arm/mach-pnx4008/irq.c b/arch/arm/mach-pnx4008/irq.c index 5ed67e1947a8..a3e20058e271 100644 --- a/arch/arm/mach-pnx4008/irq.c +++ b/arch/arm/mach-pnx4008/irq.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <asm/hardware.h> | 26 | #include <asm/hardware.h> |
27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
28 | #include <asm/setup.h> | 28 | #include <asm/setup.h> |
29 | #include <asm/mach-types.h> | ||
30 | #include <asm/pgtable.h> | 29 | #include <asm/pgtable.h> |
31 | #include <asm/page.h> | 30 | #include <asm/page.h> |
32 | #include <asm/system.h> | 31 | #include <asm/system.h> |
diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c index 40116d254349..52c51f91ed8a 100644 --- a/arch/arm/mach-pnx4008/pm.c +++ b/arch/arm/mach-pnx4008/pm.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
21 | 21 | ||
22 | #include <asm/io.h> | 22 | #include <asm/io.h> |
23 | #include <asm/mach-types.h> | ||
24 | #include <asm/cacheflush.h> | 23 | #include <asm/cacheflush.h> |
25 | #include <asm/arch/pm.h> | 24 | #include <asm/arch/pm.h> |
26 | #include <asm/arch/clock.h> | 25 | #include <asm/arch/clock.h> |
diff --git a/arch/arm/mach-sa1100/collie_pm.c b/arch/arm/mach-sa1100/collie_pm.c index 94620be7bfac..26ddb8ad4685 100644 --- a/arch/arm/mach-sa1100/collie_pm.c +++ b/arch/arm/mach-sa1100/collie_pm.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | 25 | ||
26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
27 | #include <asm/mach-types.h> | ||
28 | #include <asm/hardware.h> | 27 | #include <asm/hardware.h> |
29 | #include <asm/hardware/scoop.h> | 28 | #include <asm/hardware/scoop.h> |
30 | #include <asm/dma.h> | 29 | #include <asm/dma.h> |
diff --git a/arch/arm/plat-iop/i2c.c b/arch/arm/plat-iop/i2c.c index e99909bdba71..dad474c1516b 100644 --- a/arch/arm/plat-iop/i2c.c +++ b/arch/arm/plat-iop/i2c.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <asm/memory.h> | 27 | #include <asm/memory.h> |
28 | #include <asm/hardware.h> | 28 | #include <asm/hardware.h> |
29 | #include <asm/hardware/iop3xx.h> | 29 | #include <asm/hardware/iop3xx.h> |
30 | #include <asm/mach-types.h> | ||
31 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
32 | 31 | ||
33 | #ifdef CONFIG_ARCH_IOP32X | 32 | #ifdef CONFIG_ARCH_IOP32X |
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index d9bc15a69e5d..06f114a25684 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
25 | #include <asm/mach/pci.h> | 25 | #include <asm/mach/pci.h> |
26 | #include <asm/hardware/iop3xx.h> | 26 | #include <asm/hardware/iop3xx.h> |
27 | #include <asm/mach-types.h> | ||
28 | 27 | ||
29 | // #define DEBUG | 28 | // #define DEBUG |
30 | 29 | ||
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 5d107520e6b9..52002ac58bad 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c | |||
@@ -30,7 +30,6 @@ | |||
30 | 30 | ||
31 | #include <asm/hardware.h> | 31 | #include <asm/hardware.h> |
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
33 | #include <asm/mach-types.h> | ||
34 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
35 | 34 | ||
36 | #include <asm/arch/board.h> | 35 | #include <asm/arch/board.h> |
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 7990ab185bb1..647ed5971c60 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <asm/mach-types.h> | ||
30 | #include <asm/arch/mux.h> | 29 | #include <asm/arch/mux.h> |
31 | 30 | ||
32 | #define OMAP_I2C_SIZE 0x3f | 31 | #define OMAP_I2C_SIZE 0x3f |
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index af3846eda985..4f427a51243b 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
38 | 38 | ||
39 | #include <asm/hardware.h> | 39 | #include <asm/hardware.h> |
40 | #include <asm/mach-types.h> | ||
41 | 40 | ||
42 | #include <asm/arch/i2c.h> | 41 | #include <asm/arch/i2c.h> |
43 | 42 | ||
diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c index b36db1797c11..e3c12e365c49 100644 --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <linux/rtc.h> | 41 | #include <linux/rtc.h> |
42 | #include <linux/bcd.h> | 42 | #include <linux/bcd.h> |
43 | 43 | ||
44 | #include <asm/mach-types.h> | ||
45 | #include <asm/mach/irq.h> | 44 | #include <asm/mach/irq.h> |
46 | 45 | ||
47 | #include <asm/arch/gpio.h> | 46 | #include <asm/arch/gpio.h> |
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c index 176532ffae0e..8a3bb23f8ae7 100644 --- a/drivers/ide/arm/ide_arm.c +++ b/drivers/ide/arm/ide_arm.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/ide.h> | 12 | #include <linux/ide.h> |
13 | 13 | ||
14 | #include <asm/mach-types.h> | ||
15 | #include <asm/irq.h> | 14 | #include <asm/irq.h> |
16 | 15 | ||
17 | #define DRV_NAME "ide_arm" | 16 | #define DRV_NAME "ide_arm" |
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 10afd2068068..435ac071aab3 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <asm/irq.h> | 40 | #include <asm/irq.h> |
41 | #include <asm/hardware.h> | 41 | #include <asm/hardware.h> |
42 | #include <asm/io.h> | 42 | #include <asm/io.h> |
43 | #include <asm/mach-types.h> | ||
44 | #include <asm/arch/mux.h> | 43 | #include <asm/arch/mux.h> |
45 | 44 | ||
46 | #undef NEW_BOARD_LEARNING_MODE | 45 | #undef NEW_BOARD_LEARNING_MODE |
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 6f1516f50750..8a925359d82e 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
28 | 28 | ||
29 | #include <asm/mach-types.h> | ||
30 | #include <asm/mach/arch.h> | 29 | #include <asm/mach/arch.h> |
31 | #include <asm/mach/map.h> | 30 | #include <asm/mach/map.h> |
32 | 31 | ||
diff --git a/drivers/leds/leds-corgi.c b/drivers/leds/leds-corgi.c index a709704b9f93..e9d419ff784e 100644 --- a/drivers/leds/leds-corgi.c +++ b/drivers/leds/leds-corgi.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
18 | #include <asm/mach-types.h> | ||
19 | #include <asm/arch/corgi.h> | 18 | #include <asm/arch/corgi.h> |
20 | #include <asm/arch/hardware.h> | 19 | #include <asm/arch/hardware.h> |
21 | #include <asm/arch/pxa-regs.h> | 20 | #include <asm/arch/pxa-regs.h> |
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index dbc26eb6a89e..1f587a239b02 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -29,7 +29,6 @@ | |||
29 | 29 | ||
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
32 | #include <asm/mach-types.h> | ||
33 | 32 | ||
34 | #include <asm/arch/board.h> | 33 | #include <asm/arch/board.h> |
35 | #include <asm/arch/mmc.h> | 34 | #include <asm/arch/mmc.h> |
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index 7111c65f0b30..7b70c66504a0 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
18 | #include <asm/hardware/uengine.h> | 18 | #include <asm/hardware/uengine.h> |
19 | #include <asm/mach-types.h> | ||
20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
21 | #include "ixp2400_rx.ucode" | 20 | #include "ixp2400_rx.ucode" |
22 | #include "ixp2400_tx.ucode" | 21 | #include "ixp2400_tx.ucode" |
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index e2d8a5d86c40..895fb6b96aed 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -44,7 +44,6 @@ | |||
44 | #include <asm/io.h> | 44 | #include <asm/io.h> |
45 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
46 | #include <asm/system.h> | 46 | #include <asm/system.h> |
47 | #include <asm/mach-types.h> | ||
48 | #include <asm/gpio.h> | 47 | #include <asm/gpio.h> |
49 | 48 | ||
50 | #include <asm/arch/board.h> | 49 | #include <asm/arch/board.h> |
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 6b1ef488043b..021955a57722 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
@@ -57,7 +57,6 @@ | |||
57 | #include <asm/plat-s3c24xx/regs-udc.h> | 57 | #include <asm/plat-s3c24xx/regs-udc.h> |
58 | #include <asm/plat-s3c24xx/udc.h> | 58 | #include <asm/plat-s3c24xx/udc.h> |
59 | 59 | ||
60 | #include <asm/mach-types.h> | ||
61 | 60 | ||
62 | #include "s3c2410_udc.h" | 61 | #include "s3c2410_udc.h" |
63 | 62 | ||
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index a5d8e550d897..3eae40f8743f 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
@@ -15,7 +15,6 @@ | |||
15 | #include <linux/clk.h> | 15 | #include <linux/clk.h> |
16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
17 | 17 | ||
18 | #include <asm/mach-types.h> | ||
19 | #include <asm/hardware.h> | 18 | #include <asm/hardware.h> |
20 | #include <asm/gpio.h> | 19 | #include <asm/gpio.h> |
21 | 20 | ||
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 5adaf36e47d0..e19b07d35ea8 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/signal.h> | 28 | #include <linux/signal.h> |
29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
30 | 30 | ||
31 | #include <asm/mach-types.h> | ||
32 | #include <asm/hardware.h> | 31 | #include <asm/hardware.h> |
33 | 32 | ||
34 | static struct clk *usb_host_clock; | 33 | static struct clk *usb_host_clock; |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 6ad8f2fc57b9..037956a60bfa 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
26 | #include <asm/mach-types.h> | ||
27 | 26 | ||
28 | #include <asm/arch/platform.h> | 27 | #include <asm/arch/platform.h> |
29 | #include <asm/arch/irqs.h> | 28 | #include <asm/arch/irqs.h> |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 127b15799024..1f516d6cf514 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
26 | 26 | ||
27 | #include <asm/mach-types.h> | ||
28 | #include <asm/hardware.h> | 27 | #include <asm/hardware.h> |
29 | #include <asm/arch/pxa-regs.h> | 28 | #include <asm/arch/pxa-regs.h> |
30 | #include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */ | 29 | #include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */ |
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index f85af5c4fa68..d9abc48a210b 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
29 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
30 | 30 | ||
31 | #include <asm/mach-types.h> | ||
32 | #include <asm/arch/dma.h> | 31 | #include <asm/arch/dma.h> |
33 | #include <asm/arch/omapfb.h> | 32 | #include <asm/arch/omapfb.h> |
34 | 33 | ||
diff --git a/include/asm-arm/arch-ixp23xx/memory.h b/include/asm-arm/arch-ixp23xx/memory.h index 6d859d742d7f..6940a14f32a0 100644 --- a/include/asm-arm/arch-ixp23xx/memory.h +++ b/include/asm-arm/arch-ixp23xx/memory.h | |||
@@ -28,7 +28,6 @@ | |||
28 | * to an address that the kernel can use. | 28 | * to an address that the kernel can use. |
29 | */ | 29 | */ |
30 | #ifndef __ASSEMBLY__ | 30 | #ifndef __ASSEMBLY__ |
31 | #include <asm/mach-types.h> | ||
32 | 31 | ||
33 | #define __virt_to_bus(v) \ | 32 | #define __virt_to_bus(v) \ |
34 | ({ unsigned int ret; \ | 33 | ({ unsigned int ret; \ |
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 5e2c306399ed..0722eebe3d6a 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <sound/soc.h> | 19 | #include <sound/soc.h> |
20 | #include <sound/soc-dapm.h> | 20 | #include <sound/soc-dapm.h> |
21 | 21 | ||
22 | #include <asm/mach-types.h> | ||
23 | #include <asm/dma.h> | 22 | #include <asm/dma.h> |
24 | #include <asm/arch/hardware.h> | 23 | #include <asm/arch/hardware.h> |
25 | 24 | ||
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 4d7a9aa15f1a..22e281ef639e 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <sound/soc-dapm.h> | 24 | #include <sound/soc-dapm.h> |
25 | #include <sound/tlv.h> | 25 | #include <sound/tlv.h> |
26 | 26 | ||
27 | #include <asm/mach-types.h> | ||
28 | #include <asm/hardware/scoop.h> | 27 | #include <asm/hardware/scoop.h> |
29 | #include <asm/arch/regs-clock.h> | 28 | #include <asm/arch/regs-clock.h> |
30 | #include <asm/arch/regs-gpio.h> | 29 | #include <asm/arch/regs-gpio.h> |