diff options
| author | Ryan Mallon <ryan@bluewatersys.com> | 2011-05-20 03:34:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 17:34:24 -0400 |
| commit | 61e72bca04be2dc11a637185f2bbe6dba32ecaf3 (patch) | |
| tree | 997d0912e7f1483bdc913fae32e2c3b61481238e /arch/arm/mach-spear3xx/include/mach/generic.h | |
| parent | f6558bf92aed978a81514131e408326f25046137 (diff) | |
ARM: 6935/1: SPEAR3xx: Rename register/irq defines to remove naming conflicts
Prefix register and irq defintions to remove naming conflicts between
the three SPEAr3xx platforms.
Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.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/mach/generic.h')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/generic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index 115d3cbf7420..af4cb5b8aa40 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | * Following GPT channels will be used as clock source and clockevent | 27 | * Following GPT channels will be used as clock source and clockevent |
| 28 | */ | 28 | */ |
| 29 | #define SPEAR_GPT0_BASE SPEAR3XX_ML1_TMR_BASE | 29 | #define SPEAR_GPT0_BASE SPEAR3XX_ML1_TMR_BASE |
| 30 | #define SPEAR_GPT0_CHAN0_IRQ IRQ_CPU_GPT1_1 | 30 | #define SPEAR_GPT0_CHAN0_IRQ SPEAR3XX_IRQ_CPU_GPT1_1 |
| 31 | #define SPEAR_GPT0_CHAN1_IRQ IRQ_CPU_GPT1_2 | 31 | #define SPEAR_GPT0_CHAN1_IRQ SPEAR3XX_IRQ_CPU_GPT1_2 |
| 32 | 32 | ||
| 33 | /* Add spear3xx family device structure declarations here */ | 33 | /* Add spear3xx family device structure declarations here */ |
| 34 | extern struct amba_device gpio_device; | 34 | extern struct amba_device gpio_device; |