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-ixp2000/ixdp2x00.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-ixp2000/ixdp2x00.c')
-rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index 40eef8b36740..af48cb52dfc4 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c | |||
@@ -106,7 +106,7 @@ static void ixdp2x00_irq_unmask(unsigned int irq) | |||
106 | ixp2000_release_slowport(&old_cfg); | 106 | ixp2000_release_slowport(&old_cfg); |
107 | } | 107 | } |
108 | 108 | ||
109 | static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) | 109 | static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc) |
110 | { | 110 | { |
111 | volatile u32 ex_interrupt = 0; | 111 | volatile u32 ex_interrupt = 0; |
112 | static struct slowport_cfg old_cfg; | 112 | static struct slowport_cfg old_cfg; |
@@ -132,7 +132,7 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irqdesc *desc, struct | |||
132 | struct irqdesc *cpld_desc; | 132 | struct irqdesc *cpld_desc; |
133 | int cpld_irq = IXP2000_BOARD_IRQ(0) + i; | 133 | int cpld_irq = IXP2000_BOARD_IRQ(0) + i; |
134 | cpld_desc = irq_desc + cpld_irq; | 134 | cpld_desc = irq_desc + cpld_irq; |
135 | desc_handle_irq(cpld_irq, cpld_desc, regs); | 135 | desc_handle_irq(cpld_irq, cpld_desc); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | 138 | ||