diff options
| author |   viresh kumar <viresh.kumar@st.com> | 2011-05-20 08:34:23 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 22:34:24 +0100 |
| commit | 1d23d2fcfa3f2e7ee90bd2779a842ee737d15365 (patch) | |
| tree | 9904819b2fbfcff434f385f497c4379e13bd6fd6 /arch/arm/mach-spear3xx/include | |
| parent | ARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts (diff) | |
| download | linux-dev-1d23d2fcfa3f2e7ee90bd2779a842ee737d15365.tar.xz linux-dev-1d23d2fcfa3f2e7ee90bd2779a842ee737d15365.zip | |
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/include')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/generic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index 8b04f085e8a3..b8f31c3935f7 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -31,8 +31,8 @@ #define SPEAR_GPT0_CHAN1_IRQ SPEAR3XX_IRQ_CPU_GPT1_2 /* Add spear3xx family device structure declarations here */ -extern struct amba_device gpio_device; -extern struct amba_device uart_device; +extern struct amba_device spear3xx_gpio_device; +extern struct amba_device spear3xx_uart_device; extern struct sys_timer spear3xx_timer; /* Add spear3xx family function declarations here */ @@ -98,7 +98,7 @@ extern struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50; /* spear300 declarations */ #ifdef CONFIG_MACH_SPEAR300 /* Add spear300 machine device structure declarations here */ -extern struct amba_device gpio1_device; +extern struct amba_device spear300_gpio1_device; /* pad mux modes */ extern struct pmx_mode spear300_nand_mode; |