diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 17:07:18 -0400 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /arch/powerpc/kernel/crash.c | |
| parent | 3dd836a56de0d4f049438412959b905e1db4666e (diff) | |
| parent | 63b98080daa35f0d682db04f4fb7ada010888752 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/kernel/crash.c')
| -rw-r--r-- | arch/powerpc/kernel/crash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index f04c18e08b8b..1af41f7616dc 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c | |||
| @@ -295,7 +295,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs) | |||
| 295 | struct irq_desc *desc = irq_desc + irq; | 295 | struct irq_desc *desc = irq_desc + irq; |
| 296 | 296 | ||
| 297 | if (desc->status & IRQ_INPROGRESS) | 297 | if (desc->status & IRQ_INPROGRESS) |
| 298 | desc->chip->end(irq); | 298 | desc->chip->eoi(irq); |
| 299 | 299 | ||
| 300 | if (!(desc->status & IRQ_DISABLED)) | 300 | if (!(desc->status & IRQ_DISABLED)) |
| 301 | desc->chip->disable(irq); | 301 | desc->chip->disable(irq); |