diff --git a/[refs] b/[refs] index e3d4006b552a..42a952549d16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d28a170d5b67248d690df68d46491ee2cf6f4f6d +refs/heads/master: 98aa686494f92e881869f76bfb734cbb1f53cb13 diff --git a/trunk/include/asm-arm/arch-ixp23xx/irqs.h b/trunk/include/asm-arm/arch-ixp23xx/irqs.h index e69639585721..27c580898958 100644 --- a/trunk/include/asm-arm/arch-ixp23xx/irqs.h +++ b/trunk/include/asm-arm/arch-ixp23xx/irqs.h @@ -153,7 +153,7 @@ */ #define NR_IXP23XX_MACH_IRQS 32 -#define NR_IRQS NR_IXP23XX_IRQS + NR_IXP23XX_MACH_IRQS +#define NR_IRQS (NR_IXP23XX_IRQS + NR_IXP23XX_MACH_IRQS) #define IXP23XX_MACH_IRQ(irq) (NR_IXP23XX_IRQ + (irq)) diff --git a/trunk/include/asm-arm/arch-omap/board-innovator.h b/trunk/include/asm-arm/arch-omap/board-innovator.h index b3cf33441f6e..56d2c98e143c 100644 --- a/trunk/include/asm-arm/arch-omap/board-innovator.h +++ b/trunk/include/asm-arm/arch-omap/board-innovator.h @@ -37,7 +37,7 @@ #define OMAP1510P1_EMIFF_PRI_VALUE 0x00 #define NR_FPGA_IRQS 24 -#define NR_IRQS IH_BOARD_BASE + NR_FPGA_IRQS +#define NR_IRQS (IH_BOARD_BASE + NR_FPGA_IRQS) #ifndef __ASSEMBLY__ void fpga_write(unsigned char val, int reg);