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-ixp4xx/nslu2-power.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-ixp4xx/nslu2-power.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-power.c b/arch/arm/mach-ixp4xx/nslu2-power.c index a29b3b2b61b6..acd71e9c38a7 100644 --- a/arch/arm/mach-ixp4xx/nslu2-power.c +++ b/arch/arm/mach-ixp4xx/nslu2-power.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <asm/mach-types.h> | 26 | #include <asm/mach-types.h> |
| 27 | 27 | ||
| 28 | static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *regs) | 28 | static irqreturn_t nslu2_power_handler(int irq, void *dev_id) |
| 29 | { | 29 | { |
| 30 | /* Signal init to do the ctrlaltdel action, this will bypass init if | 30 | /* Signal init to do the ctrlaltdel action, this will bypass init if |
| 31 | * it hasn't started and do a kernel_restart. | 31 | * it hasn't started and do a kernel_restart. |
| @@ -35,7 +35,7 @@ static irqreturn_t nslu2_power_handler(int irq, void *dev_id, struct pt_regs *re | |||
| 35 | return IRQ_HANDLED; | 35 | return IRQ_HANDLED; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | static irqreturn_t nslu2_reset_handler(int irq, void *dev_id, struct pt_regs *regs) | 38 | static irqreturn_t nslu2_reset_handler(int irq, void *dev_id) |
| 39 | { | 39 | { |
| 40 | /* This is the paper-clip reset, it shuts the machine down directly. | 40 | /* This is the paper-clip reset, it shuts the machine down directly. |
| 41 | */ | 41 | */ |