diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
commit | 0fc24c1ebff281406d66840cbaa6d303bc2cae24 (patch) | |
tree | b3cacbb64fa31671d2f6241f38b5dd31db4a643a /arch/arm/plat-omap/include/mach/irqs.h | |
parent | b9914406fb128bee01b2a23a35eafbc83ff915f0 (diff) | |
parent | 18aa04d882fe72eb59ea2c9e3f78400d85b6535f (diff) |
Merge branch 'rmk-next' into s3c64xx
Diffstat (limited to 'arch/arm/plat-omap/include/mach/irqs.h')
-rw-r--r-- | arch/arm/plat-omap/include/mach/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h index a2929ac8c68..bed5274c910 100644 --- a/arch/arm/plat-omap/include/mach/irqs.h +++ b/arch/arm/plat-omap/include/mach/irqs.h @@ -372,7 +372,7 @@ /* External TWL4030 gpio interrupts are optional */ #define TWL4030_GPIO_IRQ_BASE TWL4030_PWR_IRQ_END -#ifdef CONFIG_TWL4030_GPIO +#ifdef CONFIG_GPIO_TWL4030 #define TWL4030_GPIO_NR_IRQS 18 #else #define TWL4030_GPIO_NR_IRQS 0 |