diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:53:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 13:59:54 -0400 |
commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-omap1/fpga.c | |
parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) |
Initial blind fixup for arm for irq changes
Untested, but this should fix up the bulk of the totally mechanical
issues, and should make the actual detail fixing easier.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-omap1/fpga.c')
-rw-r--r-- | arch/arm/mach-omap1/fpga.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index efe9bfc6e55f..8e40208b10bb 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c | |||
@@ -84,8 +84,7 @@ static void fpga_mask_ack_irq(unsigned int irq) | |||
84 | fpga_ack_irq(irq); | 84 | fpga_ack_irq(irq); |
85 | } | 85 | } |
86 | 86 | ||
87 | void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc, | 87 | void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc) |
88 | struct pt_regs *regs) | ||
89 | { | 88 | { |
90 | struct irqdesc *d; | 89 | struct irqdesc *d; |
91 | u32 stat; | 90 | u32 stat; |
@@ -101,7 +100,7 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc, | |||
101 | fpga_irq++, stat >>= 1) { | 100 | fpga_irq++, stat >>= 1) { |
102 | if (stat & 1) { | 101 | if (stat & 1) { |
103 | d = irq_desc + fpga_irq; | 102 | d = irq_desc + fpga_irq; |
104 | desc_handle_irq(fpga_irq, d, regs); | 103 | desc_handle_irq(fpga_irq, d); |
105 | } | 104 | } |
106 | } | 105 | } |
107 | } | 106 | } |