diff options
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/impd1.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 6 | ||||
-rw-r--r-- | arch/arm/mach-integrator/time.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index dacbf504dae..20071a2767c 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
@@ -15,11 +15,11 @@ | |||
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/smp.h> | 17 | #include <linux/smp.h> |
18 | #include <linux/amba/bus.h> | ||
18 | 19 | ||
19 | #include <asm/hardware.h> | 20 | #include <asm/hardware.h> |
20 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
22 | #include <asm/hardware/amba.h> | ||
23 | #include <asm/hardware/arm_timer.h> | 23 | #include <asm/hardware/arm_timer.h> |
24 | #include <asm/arch/cm.h> | 24 | #include <asm/arch/cm.h> |
25 | #include <asm/system.h> | 25 | #include <asm/system.h> |
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index a4bafee77a0..a85d471c5bf 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c | |||
@@ -18,11 +18,11 @@ | |||
18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
21 | #include <linux/amba/bus.h> | ||
22 | #include <linux/amba/clcd.h> | ||
21 | 23 | ||
22 | #include <asm/io.h> | 24 | #include <asm/io.h> |
23 | #include <asm/hardware/icst525.h> | 25 | #include <asm/hardware/icst525.h> |
24 | #include <asm/hardware/amba.h> | ||
25 | #include <asm/hardware/amba_clcd.h> | ||
26 | #include <asm/arch/lm.h> | 26 | #include <asm/arch/lm.h> |
27 | #include <asm/arch/impd1.h> | 27 | #include <asm/arch/impd1.h> |
28 | #include <asm/sizes.h> | 28 | #include <asm/sizes.h> |
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 4c0f7c65fac..3afedeb56a6 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/string.h> | 26 | #include <linux/string.h> |
27 | #include <linux/sysdev.h> | 27 | #include <linux/sysdev.h> |
28 | #include <linux/amba/bus.h> | ||
29 | #include <linux/amba/kmi.h> | ||
28 | 30 | ||
29 | #include <asm/hardware.h> | 31 | #include <asm/hardware.h> |
30 | #include <asm/io.h> | 32 | #include <asm/io.h> |
@@ -32,8 +34,6 @@ | |||
32 | #include <asm/setup.h> | 34 | #include <asm/setup.h> |
33 | #include <asm/param.h> /* HZ */ | 35 | #include <asm/param.h> /* HZ */ |
34 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
35 | #include <asm/hardware/amba.h> | ||
36 | #include <asm/hardware/amba_kmi.h> | ||
37 | 37 | ||
38 | #include <asm/arch/lm.h> | 38 | #include <asm/arch/lm.h> |
39 | 39 | ||
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 93f7ccb22c2..16cf2482a3e 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -16,15 +16,15 @@ | |||
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
18 | #include <linux/sysdev.h> | 18 | #include <linux/sysdev.h> |
19 | #include <linux/amba/bus.h> | ||
20 | #include <linux/amba/kmi.h> | ||
21 | #include <linux/amba/clcd.h> | ||
19 | 22 | ||
20 | #include <asm/hardware.h> | 23 | #include <asm/hardware.h> |
21 | #include <asm/io.h> | 24 | #include <asm/io.h> |
22 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
23 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
24 | #include <asm/mach-types.h> | 27 | #include <asm/mach-types.h> |
25 | #include <asm/hardware/amba.h> | ||
26 | #include <asm/hardware/amba_kmi.h> | ||
27 | #include <asm/hardware/amba_clcd.h> | ||
28 | #include <asm/hardware/icst525.h> | 28 | #include <asm/hardware/icst525.h> |
29 | 29 | ||
30 | #include <asm/arch/cm.h> | 30 | #include <asm/arch/cm.h> |
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c index 1a844ca139e..9f46aaef896 100644 --- a/arch/arm/mach-integrator/time.c +++ b/arch/arm/mach-integrator/time.c | |||
@@ -14,8 +14,8 @@ | |||
14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
17 | #include <linux/amba/bus.h> | ||
17 | 18 | ||
18 | #include <asm/hardware/amba.h> | ||
19 | #include <asm/hardware.h> | 19 | #include <asm/hardware.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <asm/uaccess.h> | 21 | #include <asm/uaccess.h> |