diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 14:48:42 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 14:48:42 +0000 |
commit | f66f9bdf6d2c2b540f73bb57bd24b886b39beb14 (patch) | |
tree | 03d52df19bd6b7b2c424ed5d94590fcde666ab28 /arch/arm/mach-lpc32xx/irq.c | |
parent | f6175f228cc8dab421e762158ad40f5614b18941 (diff) | |
parent | 36225decb417a20abcb0b2c24cdbcb6f1d608f83 (diff) | |
download | linux-3.10-f66f9bdf6d2c2b540f73bb57bd24b886b39beb14.tar.gz linux-3.10-f66f9bdf6d2c2b540f73bb57bd24b886b39beb14.tar.bz2 linux-3.10-f66f9bdf6d2c2b540f73bb57bd24b886b39beb14.zip |
Merge branch 'lpc32xx/drivers' into next/drivers
Diffstat (limited to 'arch/arm/mach-lpc32xx/irq.c')
-rw-r--r-- | arch/arm/mach-lpc32xx/irq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-lpc32xx/irq.c b/arch/arm/mach-lpc32xx/irq.c index c74de01ab5b..d080cb1123d 100644 --- a/arch/arm/mach-lpc32xx/irq.c +++ b/arch/arm/mach-lpc32xx/irq.c @@ -150,6 +150,10 @@ static const struct lpc32xx_event_info lpc32xx_events[NR_IRQS] = { .event_group = &lpc32xx_event_int_regs, .mask = LPC32XX_CLKPWR_INTSRC_KEY_BIT, }, + [IRQ_LPC32XX_ETHERNET] = { + .event_group = &lpc32xx_event_int_regs, + .mask = LPC32XX_CLKPWR_INTSRC_MAC_BIT, + }, [IRQ_LPC32XX_USB_OTG_ATX] = { .event_group = &lpc32xx_event_int_regs, .mask = LPC32XX_CLKPWR_INTSRC_USBATXINT_BIT, |