summaryrefslogtreecommitdiff
path: root/arch/arm/mach-spear3xx/spear3xx.c
diff options
context:
space:
mode:
authorviresh kumar <viresh.kumar@st.com>2011-05-20 08:34:23 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-20 22:34:24 +0100
commit1d23d2fcfa3f2e7ee90bd2779a842ee737d15365 (patch)
tree9904819b2fbfcff434f385f497c4379e13bd6fd6 /arch/arm/mach-spear3xx/spear3xx.c
parent6618c3ada039116ca0392ce955df081adc5f015c (diff)
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>
Diffstat (limited to 'arch/arm/mach-spear3xx/spear3xx.c')
-rw-r--r--arch/arm/mach-spear3xx/spear3xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index b4378a056294..10af45da86a0 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -28,7 +28,7 @@ static struct pl061_platform_data gpio_plat_data = {
.irq_base = SPEAR3XX_GPIO_INT_BASE,
};
-struct amba_device gpio_device = {
+struct amba_device spear3xx_gpio_device = {
.dev = {
.init_name = "gpio",
.platform_data = &gpio_plat_data,
@@ -42,7 +42,7 @@ struct amba_device gpio_device = {
};
/* uart device registration */
-struct amba_device uart_device = {
+struct amba_device spear3xx_uart_device = {
.dev = {
.init_name = "uart",
},