diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 |
| commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
| tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /arch/arm/mach-imx/irq.c | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/arm/mach-imx/irq.c')
| -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, | |||
| 204 | imx_gpio_handler(mask, irq, desc, regs); | 204 | imx_gpio_handler(mask, irq, desc, regs); |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | static struct irqchip imx_internal_chip = { | 207 | static struct irq_chip imx_internal_chip = { |
| 208 | .name = "MPU", | ||
| 208 | .ack = imx_mask_irq, | 209 | .ack = imx_mask_irq, |
| 209 | .mask = imx_mask_irq, | 210 | .mask = imx_mask_irq, |
| 210 | .unmask = imx_unmask_irq, | 211 | .unmask = imx_unmask_irq, |
| 211 | }; | 212 | }; |
| 212 | 213 | ||
| 213 | static struct irqchip imx_gpio_chip = { | 214 | static struct irq_chip imx_gpio_chip = { |
| 215 | .name = "GPIO", | ||
| 214 | .ack = imx_gpio_ack_irq, | 216 | .ack = imx_gpio_ack_irq, |
| 215 | .mask = imx_gpio_mask_irq, | 217 | .mask = imx_gpio_mask_irq, |
| 216 | .unmask = imx_gpio_unmask_irq, | 218 | .unmask = imx_gpio_unmask_irq, |