Skip to content

Commit

Permalink
ARM: spear: rename duplicate pl080_plat_data
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnd Bergmann committed Mar 12, 2013
1 parent d9909eb commit 553e7f7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-spear/spear6xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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),
{}
};

Expand Down

0 comments on commit 553e7f7

Please sign in to comment.