diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:21:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:21:23 -0700 |
| commit | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch) | |
| tree | ecfe847dda816361d83b1da6d7213b27721e7fd7 /arch/arm/mach-imx | |
| parent | a166222cde740b34d97fe49dca70348197f4534e (diff) | |
| parent | e252630f1fd1d14ac4081e566d2f697ae1779215 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/irq.c b/arch/arm/mach-imx/irq.c index a5de5f1da9f2..2688bd82c2a2 100644 --- a/arch/arm/mach-imx/irq.c +++ b/arch/arm/mach-imx/irq.c @@ -204,13 +204,15 @@ imx_gpiod_demux_handler(unsigned int irq_unused, struct irqdesc *desc, imx_gpio_handler(mask, irq, desc, regs); } -static struct irqchip imx_internal_chip = { +static struct irq_chip imx_internal_chip = { + .name = "MPU", .ack = imx_mask_irq, .mask = imx_mask_irq, .unmask = imx_unmask_irq, }; -static struct irqchip imx_gpio_chip = { +static struct irq_chip imx_gpio_chip = { + .name = "GPIO", .ack = imx_gpio_ack_irq, .mask = imx_gpio_mask_irq, .unmask = imx_gpio_unmask_irq, |