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-spear3xx/spear320.c | |
| parent | 83f230f1121051d58603640535d0384a01605f6c (diff) | |
| download | lwn-d42799b7827bcb92c47de26f900e75885bcb447b.tar.gz lwn-d42799b7827bcb92c47de26f900e75885bcb447b.zip | |
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-spear3xx/spear320.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear320.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c index f671a0ad5217..e9db7dbf6c57 100644 --- a/arch/arm/mach-spear3xx/spear320.c +++ b/arch/arm/mach-spear3xx/spear320.c @@ -223,7 +223,7 @@ static struct amba_pl011_data spear320_uart_data[] = { static struct of_dev_auxdata spear320_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("arm,pl022", SPEAR3XX_ICM1_SSP_BASE, NULL, &pl022_plat_data), - OF_DEV_AUXDATA("arm,pl080", SPEAR3XX_ICM3_DMA_BASE, NULL, + OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL, &pl080_plat_data), OF_DEV_AUXDATA("arm,pl022", SPEAR320_SSP0_BASE, NULL, &spear320_ssp_data[0]), |