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-omap2/irq.c | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 3eed6a737bf8..dfc3b35cc1ff 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -94,7 +94,8 @@ static void omap_mask_ack_irq(unsigned int irq) | |||
| 94 | omap_ack_irq(irq); | 94 | omap_ack_irq(irq); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | static struct irqchip omap_irq_chip = { | 97 | static struct irq_chip omap_irq_chip = { |
| 98 | .name = "INTC", | ||
| 98 | .ack = omap_mask_ack_irq, | 99 | .ack = omap_mask_ack_irq, |
| 99 | .mask = omap_mask_irq, | 100 | .mask = omap_mask_irq, |
| 100 | .unmask = omap_unmask_irq, | 101 | .unmask = omap_unmask_irq, |