diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 10:53:39 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 10:59:54 -0700 | 
| commit | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (patch) | |
| tree | cfd72be941ecd172627a06dd61d98b55cec63a39 /arch/arm/mach-omap1/fpga.c | |
| parent | da104a83692cf07434ab3b20bf10093bdbc3f97e (diff) | |
| download | olio-linux-3.10-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.tar.xz olio-linux-3.10-0cd61b68c340a4f901a06e8bb5e0dea4353161c0.zip  | |
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 efe9bfc6e55..8e40208b10b 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)  	fpga_ack_irq(irq);  } -void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc, -			      struct pt_regs *regs) +void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc)  {  	struct irqdesc *d;  	u32 stat; @@ -101,7 +100,7 @@ void innovator_fpga_IRQ_demux(unsigned int irq, struct irqdesc *desc,  	     fpga_irq++, stat >>= 1) {  		if (stat & 1) {  			d = irq_desc + fpga_irq; -			desc_handle_irq(fpga_irq, d, regs); +			desc_handle_irq(fpga_irq, d);  		}  	}  }  |