diff options
author | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-11-08 00:27:23 +0400 |
commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/arm/mach-u300/include/mach/irqs.h | |
parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
download | linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/arm/mach-u300/include/mach/irqs.h')
-rw-r--r-- | arch/arm/mach-u300/include/mach/irqs.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index d270fea32926..db3fbfa1d6e9 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h @@ -117,14 +117,6 @@ #define IRQ_U300_GPIO_END (U300_VIC_IRQS_END) #endif -/* Optional AB3550 mixsig chip */ -#ifdef CONFIG_AB3550_CORE -#define IRQ_AB3550_BASE (IRQ_U300_GPIO_END) -#define IRQ_AB3550_END (IRQ_AB3550_BASE + 38) -#else -#define IRQ_AB3550_END (IRQ_U300_GPIO_END) -#endif - -#define NR_IRQS (IRQ_AB3550_END) +#define NR_IRQS (IRQ_U300_GPIO_END) #endif |