diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-13 20:01:41 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-26 13:49:05 +0100 |
| commit | c36928adfc24398f8fe49cf498389500c14a5550 (patch) | |
| tree | 8e987135da168066dac14f5d59d2572104c3b70a | |
| parent | 29525484cd2524a31ee0924831ab43b46ea6ebe1 (diff) | |
| download | talos-op-linux-c36928adfc24398f8fe49cf498389500c14a5550.tar.gz talos-op-linux-c36928adfc24398f8fe49cf498389500c14a5550.zip | |
ARM: integrator: localize the lm.h header
As we move toward multiplatform support for the Integrator family
we need to localize all <mach/*> headers. This moves the lm.h
header down to the machine folder as it is not used outside it
anyway.
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/impd1.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/lm.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/lm.h (renamed from arch/arm/mach-integrator/include/mach/lm.h) | 0 |
5 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index d9b784824808..a90e83fe8776 100644 --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c @@ -25,9 +25,9 @@ #include <linux/slab.h> #include <linux/irqchip/arm-vic.h> -#include <mach/lm.h> #include <mach/impd1.h> #include <asm/sizes.h> +#include "lm.h" static int module_id; diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index fedcd2fab094..f4ef41707046 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -51,8 +51,6 @@ #include <asm/param.h> /* HZ */ #include <asm/mach-types.h> -#include <mach/lm.h> - #include <asm/mach/arch.h> #include <asm/mach/irq.h> #include <asm/mach/map.h> @@ -61,6 +59,7 @@ #include "cm.h" #include "common.h" #include "pci_v3.h" +#include "lm.h" /* Base address to the AP system controller */ void __iomem *ap_syscon_base; diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 0ad5f60598c8..9af1ed995faa 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -32,9 +32,6 @@ #include <mach/platform.h> #include <asm/setup.h> #include <asm/mach-types.h> - -#include <mach/lm.h> - #include <asm/mach/arch.h> #include <asm/mach/irq.h> #include <asm/mach/map.h> diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c index f52c7af31eaa..3f9e9f043168 100644 --- a/arch/arm/mach-integrator/lm.c +++ b/arch/arm/mach-integrator/lm.c @@ -12,7 +12,7 @@ #include <linux/device.h> #include <linux/slab.h> -#include <mach/lm.h> +#include "lm.h" #define to_lm_device(d) container_of(d, struct lm_device, dev) #define to_lm_driver(d) container_of(d, struct lm_driver, drv) diff --git a/arch/arm/mach-integrator/include/mach/lm.h b/arch/arm/mach-integrator/lm.h index 28186b6f2c09..28186b6f2c09 100644 --- a/arch/arm/mach-integrator/include/mach/lm.h +++ b/arch/arm/mach-integrator/lm.h |
