diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-12-06 08:48:28 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-12 12:40:07 -0400 |
commit | 553e7f75a171654d032d0eacbb1ba75bd9be7e8a (patch) | |
tree | d0cbe01c3b6932bcb0ba2fd91e7413e927b0774c /arch/arm/mach-spear | |
parent | d9909ebe650f028459b9be5a2321fee520b446b0 (diff) |
ARM: spear: rename duplicate pl080_plat_data
Both spear3xx and spear6xx have a global symbol named
pl080_plat_data. Eventually, both should be removed, but
for now, we can rename one to pl080_plat_data and declare
it static, since that one does not actually need to be
visible outside of spear6xx.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Diffstat (limited to 'arch/arm/mach-spear')
-rw-r--r-- | arch/arm/mach-spear/spear6xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c index 9b5ea254ed82..ec8eefbbdfad 100644 --- a/arch/arm/mach-spear/spear6xx.c +++ b/arch/arm/mach-spear/spear6xx.c | |||
@@ -322,7 +322,7 @@ static struct pl08x_channel_data spear600_dma_info[] = { | |||
322 | }, | 322 | }, |
323 | }; | 323 | }; |
324 | 324 | ||
325 | struct pl08x_platform_data pl080_plat_data = { | 325 | static struct pl08x_platform_data spear6xx_pl080_plat_data = { |
326 | .memcpy_channel = { | 326 | .memcpy_channel = { |
327 | .bus_id = "memcpy", | 327 | .bus_id = "memcpy", |
328 | .cctl_memcpy = | 328 | .cctl_memcpy = |
@@ -406,7 +406,7 @@ void __init spear6xx_timer_init(void) | |||
406 | /* Add auxdata to pass platform data */ | 406 | /* Add auxdata to pass platform data */ |
407 | struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { | 407 | struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = { |
408 | OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL, | 408 | OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL, |
409 | &pl080_plat_data), | 409 | &spear6xx_pl080_plat_data), |
410 | {} | 410 | {} |
411 | }; | 411 | }; |
412 | 412 | ||