diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-04 10:41:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 09:40:08 +0100 |
| commit | be509729356b7433f73df2b9a966674a437fbbc1 (patch) | |
| tree | 5a3e90513c106f9dcf08405e4ebd3599fd14413c /arch/arm/mach-integrator | |
| parent | 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0 (diff) | |
| download | talos-obmc-linux-be509729356b7433f73df2b9a966674a437fbbc1.tar.gz talos-obmc-linux-be509729356b7433f73df2b9a966674a437fbbc1.zip | |
[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-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/leds.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 7fbbc17f8e8b..f439bf12be5e 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -20,7 +20,7 @@ #include <linux/amba/bus.h> #include <linux/amba/serial.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/irq.h> #include <asm/io.h> #include <asm/hardware/arm_timer.h> diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index 71c58bff304c..afa0f21ea96e 100644 --- a/arch/arm/mach-integrator/cpu.c +++ b/arch/arm/mach-integrator/cpu.c @@ -20,7 +20,7 @@ #include <linux/smp.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/mach-types.h> #include <asm/hardware/icst525.h> diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index df37e93c6fc9..3996ddc2a4b1 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -28,7 +28,7 @@ #include <linux/amba/bus.h> #include <linux/amba/kmi.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/setup.h> diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 913f64b22405..28d330101e6f 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -20,7 +20,7 @@ #include <linux/amba/kmi.h> #include <linux/amba/clcd.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/setup.h> diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c index f1436e683b49..6062180b108b 100644 --- a/arch/arm/mach-integrator/leds.c +++ b/arch/arm/mach-integrator/leds.c @@ -25,7 +25,7 @@ #include <linux/smp.h> #include <linux/spinlock.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/leds.h> #include <asm/system.h> diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index c07f497000ca..b8685d919fee 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -28,7 +28,7 @@ #include <linux/spinlock.h> #include <linux/init.h> -#include <asm/hardware.h> +#include <asm/arch/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> |
