commit 1d23d2fcfa3f2e7ee90bd2779a842ee737d15365
author viresh kumar <viresh.kumar@st.com> Fri May 20 08:34:23 2011 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri May 20 22:34:24 2011 +0100
tree 9904819b2fbfcff434f385f497c4379e13bd6fd6
parent 6618c3ada039116ca0392ce955df081adc5f015c

ARM: 6929/1: SPEAr3xx: Append spear3** with global device structures

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mach-spear3xx/spear300.c

diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 67349b5..a5e46b4 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -430,7 +430,7 @@
 	.irq_base	= SPEAR300_GPIO1_INT_BASE,
 };
 
-struct amba_device gpio1_device = {
+struct amba_device spear300_gpio1_device = {
 	.dev = {
 		.init_name = "gpio1",
 		.platform_data = &gpio1_plat_data,