diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-13 21:26:24 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-26 13:49:07 +0100 |
| commit | 1b1ef755bd910106fef15bd55386b60e88d73e16 (patch) | |
| tree | 38bd3cf8da91010126a255ab23f49104df883fc4 | |
| parent | f8487aa85b0f3c092bb3c1f27972b445a1944048 (diff) | |
ARM: integrator: localize the hardware.h header
As we move toward multiplatform support for the Integrator family
we need to localize all <mach/*> headers. This moves the hardware.h
header down to the machine folder. There are no users outside the
machine in the kernel.
Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | arch/arm/mach-integrator/core.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/hardware.h (renamed from arch/arm/mach-integrator/include/mach/hardware.h) | 0 | ||||
| -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 | 3 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 3 |
6 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 7a330f541a9d..e3f3aca43efb 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c @@ -25,12 +25,11 @@ #include <linux/of.h> #include <linux/of_address.h> -#include <mach/hardware.h> - #include <asm/mach-types.h> #include <asm/mach/time.h> #include <asm/pgtable.h> +#include "hardware.h" #include "cm.h" #include "common.h" diff --git a/arch/arm/mach-integrator/include/mach/hardware.h b/arch/arm/mach-integrator/hardware.h index 857ca5f8b9a6..857ca5f8b9a6 100644 --- a/arch/arm/mach-integrator/include/mach/hardware.h +++ b/arch/arm/mach-integrator/hardware.h diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 33d62de18a95..9d5d6386aaee 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -44,7 +44,6 @@ #include <linux/sched_clock.h> #include <linux/clk-provider.h> -#include <mach/hardware.h> #include <asm/hardware/arm_timer.h> #include <asm/setup.h> #include <asm/param.h> /* HZ */ @@ -55,6 +54,7 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> +#include "hardware.h" #include "cm.h" #include "common.h" #include "pci_v3.h" diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 6734a4efe710..c97ab88897cf 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -28,7 +28,6 @@ #include <linux/of_platform.h> #include <linux/sys_soc.h> -#include <mach/hardware.h> #include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -39,6 +38,7 @@ #include <plat/clcd.h> #include <plat/sched_clock.h> +#include "hardware.h" #include "cm.h" #include "common.h" diff --git a/arch/arm/mach-integrator/leds.c b/arch/arm/mach-integrator/leds.c index e2b1b3a4c5d3..f1dcb57a59e2 100644 --- a/arch/arm/mach-integrator/leds.c +++ b/arch/arm/mach-integrator/leds.c @@ -11,8 +11,7 @@ #include <linux/slab.h> #include <linux/leds.h> -#include <mach/hardware.h> - +#include "hardware.h" #include "cm.h" #if defined(CONFIG_NEW_LEDS) && defined(CONFIG_LEDS_CLASS) diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index 27d88afc4e2a..05e1f73a1e8d 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -34,14 +34,13 @@ #include <linux/of_pci.h> #include <video/vga.h> -#include <mach/hardware.h> - #include <asm/mach/map.h> #include <asm/signal.h> #include <asm/mach/pci.h> #include <asm/irq_regs.h> #include "pci_v3.h" +#include "hardware.h" /* * Where in the memory map does PCI live? |