diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-13 20:07:26 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-26 13:49:06 +0100 |
| commit | cc0cc4ca093f3df9e554af8dae39a126987bccf7 (patch) | |
| tree | 33500db2808f31ee5d5ed1afbfd8af481f773448 /arch/arm | |
| parent | c36928adfc24398f8fe49cf498389500c14a5550 (diff) | |
| download | linux-cc0cc4ca093f3df9e554af8dae39a126987bccf7.tar.gz linux-cc0cc4ca093f3df9e554af8dae39a126987bccf7.tar.bz2 linux-cc0cc4ca093f3df9e554af8dae39a126987bccf7.zip | |
ARM: integrator: localize the impd1.h header
As we move toward multiplatform support for the Integrator family
we need to localize all <mach/*> headers. This moves the impd1.h
header down to the machine folder, copying the the three defines
only used by the clock driver down into the clock driver.
Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-integrator/impd1.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/impd1.h (renamed from arch/arm/mach-integrator/include/mach/impd1.h) | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c index a90e83fe8776..0e870ea818c4 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/impd1.h> #include <asm/sizes.h> #include "lm.h" +#include "impd1.h" static int module_id; diff --git a/arch/arm/mach-integrator/include/mach/impd1.h b/arch/arm/mach-integrator/impd1.h index d75de4b14237..76de4dc9bee4 100644 --- a/arch/arm/mach-integrator/include/mach/impd1.h +++ b/arch/arm/mach-integrator/impd1.h @@ -1,6 +1,3 @@ -#define IMPD1_OSC1 0x00 -#define IMPD1_OSC2 0x04 -#define IMPD1_LOCK 0x08 #define IMPD1_LEDS 0x0c #define IMPD1_INT 0x10 #define IMPD1_SW 0x14 @@ -15,4 +12,3 @@ struct device; void impd1_tweak_control(struct device *dev, u32 mask, u32 val); - |