diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 10:15:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-27 10:15:53 -0400 |
| commit | 1929cef46fb057377e43a3d594404f1432db4934 (patch) | |
| tree | 47bad76826a41a841998fe45dfffb9b254a2c535 /arch/powerpc/sysdev/mpic.c | |
| parent | b5edfefc65526b34960bbff3477ded477b0328f6 (diff) | |
| parent | 7c9d93604b25c25dc059e2b12ad5e89ca3ed4376 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix mpic_resume on early G5 macs
powerpc: rtas_flash needs to use rtas_data_buf
powerpc: Unconditionally enabled irq stacks
powerpc/kexec: Wait for online/possible CPUs only.
powerpc: Disable CONFIG_SYSFS_DEPRECATED
powerpc/boot: Remove addRamdisk.c since it is now unused
powerpc: Move kdump default base address to 64MB on 64bit
powerpc: Remove dead CONFIG_HIGHPTE
powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace
powerpc/fsl-booke: Fix InstructionTLBError execute permission check
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 2102487612a4..20b73c025a45 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -1666,7 +1666,7 @@ static int mpic_resume(struct sys_device *dev) | |||
| 1666 | mpic->save_data[i].dest); | 1666 | mpic->save_data[i].dest); |
| 1667 | 1667 | ||
| 1668 | #ifdef CONFIG_MPIC_U3_HT_IRQS | 1668 | #ifdef CONFIG_MPIC_U3_HT_IRQS |
| 1669 | { | 1669 | if (mpic->fixups) { |
| 1670 | struct mpic_irq_fixup *fixup = &mpic->fixups[i]; | 1670 | struct mpic_irq_fixup *fixup = &mpic->fixups[i]; |
| 1671 | 1671 | ||
| 1672 | if (fixup->base) { | 1672 | if (fixup->base) { |