From 1d23d2fcfa3f2e7ee90bd2779a842ee737d15365 Mon Sep 17 00:00:00 2001 From: viresh kumar Date: Fri, 20 May 2011 08:34:23 +0100 Subject: ARM: 6929/1: SPEAr3xx: Append spear3** with global device structures Reviewed-by: Stanley Miao Signed-off-by: Viresh Kumar Signed-off-by: Russell King --- arch/arm/mach-spear3xx/spear3xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-spear3xx/spear3xx.c') diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index b4378a05629..10af45da86a 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", }, -- cgit v1.2.3-70-g09d2