diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 19:16:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 19:16:33 -0400 |
| commit | 3c693024cffa5c96a20b969f4efd058675e7700f (patch) | |
| tree | 2e49a90c3e67a898770fe0ea735d00326dbe3f69 /arch/ppc/platforms/sbc82xx.c | |
| parent | 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 (diff) | |
| parent | 10270613fb4d5a44c335cfa13e9626bf5743c01d (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix windfarm platform device usage
[POWERPC] Fix i2c-powermac platform device usage
[POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs
[POWERPC] ARCH=ppc pt_regs fixes
[POWERPC] Update maple defconfig
[POWERPC] Fix Maple secondary IDE interrupt
[POWERPC] Make U4 PCIe work on maple
[POWERPC] cell: fix default zImage build target
[POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces
[POWERPC] Fix xmon IRQ handler for pt_regs removal
Diffstat (limited to 'arch/ppc/platforms/sbc82xx.c')
| -rw-r--r-- | arch/ppc/platforms/sbc82xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c index 60b769c7f3fc..cc0935ccab7a 100644 --- a/arch/ppc/platforms/sbc82xx.c +++ b/arch/ppc/platforms/sbc82xx.c | |||
| @@ -121,7 +121,7 @@ struct hw_interrupt_type sbc82xx_i8259_ic = { | |||
| 121 | .end = sbc82xx_i8259_end_irq, | 121 | .end = sbc82xx_i8259_end_irq, |
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *regs) | 124 | static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id) |
| 125 | { | 125 | { |
| 126 | spin_lock(&sbc82xx_i8259_lock); | 126 | spin_lock(&sbc82xx_i8259_lock); |
| 127 | 127 | ||
| @@ -139,7 +139,7 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re | |||
| 139 | return IRQ_HANDLED; | 139 | return IRQ_HANDLED; |
| 140 | } | 140 | } |
| 141 | } | 141 | } |
| 142 | __do_IRQ(NR_SIU_INTS + irq, regs); | 142 | __do_IRQ(NR_SIU_INTS + irq); |
| 143 | return IRQ_HANDLED; | 143 | return IRQ_HANDLED; |
| 144 | } | 144 | } |
| 145 | 145 | ||