diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-12-02 14:45:27 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 17:39:31 +0100 |
| commit | d42799b7827bcb92c47de26f900e75885bcb447b (patch) | |
| tree | 2b62140f15e332adcf0c86613fb1397fb5d301a1 /arch/arm/mach-spear6xx/include/mach/misc_regs.h | |
| parent | 83f230f1121051d58603640535d0384a01605f6c (diff) | |
ARM: spear: make spear3xx/6xx mach/spear.h files identical
The two files are almost identical already basically just differ
in the identifier names. By changing the identifiers to be the
same, we are able to merge the two as a preparation to building
a combined kernel.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear6xx/include/mach/misc_regs.h')
| -rw-r--r-- | arch/arm/mach-spear6xx/include/mach/misc_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear6xx/include/mach/misc_regs.h b/arch/arm/mach-spear6xx/include/mach/misc_regs.h index c34acc201d34..28aa508cb94d 100644 --- a/arch/arm/mach-spear6xx/include/mach/misc_regs.h +++ b/arch/arm/mach-spear6xx/include/mach/misc_regs.h @@ -16,7 +16,7 @@ #include <mach/spear.h> -#define MISC_BASE IOMEM(VA_SPEAR6XX_ICM3_MISC_REG_BASE) +#define MISC_BASE IOMEM(VA_SPEAR_ICM3_MISC_REG_BASE) #define DMA_CHN_CFG (MISC_BASE + 0x0A0) #endif /* __MACH_MISC_REGS_H */ |