diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/arm/mach-omap1/irq.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/arm/mach-omap1/irq.c')
| -rw-r--r-- | arch/arm/mach-omap1/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index a11b6d807352..afd5d67e4ae7 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c | |||
| @@ -165,10 +165,10 @@ static struct omap_irq_bank omap1610_irq_banks[] = { | |||
| 165 | #endif | 165 | #endif |
| 166 | 166 | ||
| 167 | static struct irqchip omap_irq_chip = { | 167 | static struct irqchip omap_irq_chip = { |
| 168 | .ack = omap_mask_ack_irq, | 168 | .ack = omap_mask_ack_irq, |
| 169 | .mask = omap_mask_irq, | 169 | .mask = omap_mask_irq, |
| 170 | .unmask = omap_unmask_irq, | 170 | .unmask = omap_unmask_irq, |
| 171 | .wake = omap_wake_irq, | 171 | .set_wake = omap_wake_irq, |
| 172 | }; | 172 | }; |
| 173 | 173 | ||
| 174 | void __init omap_init_irq(void) | 174 | void __init omap_init_irq(void) |