aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-12-06 14:48:28 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-12 17:40:07 +0100
commit553e7f75a171654d032d0eacbb1ba75bd9be7e8a (patch)
treed0cbe01c3b6932bcb0ba2fd91e7413e927b0774c /arch/arm/mach-spear
parentd9909ebe650f028459b9be5a2321fee520b446b0 (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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c
index 9b5ea254ed8..ec8eefbbdfa 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[] = {
},
};
-struct pl08x_platform_data pl080_plat_data = {
+static struct pl08x_platform_data spear6xx_pl080_plat_data = {
.memcpy_channel = {
.bus_id = "memcpy",
.cctl_memcpy =
@@ -406,7 +406,7 @@ void __init spear6xx_timer_init(void)
/* Add auxdata to pass platform data */
struct of_dev_auxdata spear6xx_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("arm,pl080", SPEAR_ICM3_DMA_BASE, NULL,
- &pl080_plat_data),
+ &spear6xx_pl080_plat_data),
{}
};