diff options
author | Ingo Molnar | 2009-02-13 09:44:22 +0100 |
---|---|---|
committer | Ingo Molnar | 2009-02-13 09:44:22 +0100 |
commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/powerpc/sysdev/ipic.c | |
parent | x86: kernel/mpparse.c fix compilation warnings (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
download | kernel-qcow2-linux-f8a6b2b9cee298a9663cbe38ce1eb5240987cb62.tar.gz kernel-qcow2-linux-f8a6b2b9cee298a9663cbe38ce1eb5240987cb62.tar.xz kernel-qcow2-linux-f8a6b2b9cee298a9663cbe38ce1eb5240987cb62.zip |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/powerpc/sysdev/ipic.c')
-rw-r--r-- | arch/powerpc/sysdev/ipic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 88a983ece5c9..9a89cd3e80a2 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c @@ -890,7 +890,7 @@ unsigned int ipic_get_irq(void) return irq_linear_revmap(primary_ipic->irqhost, irq); } -#ifdef CONFIG_PM +#ifdef CONFIG_SUSPEND static struct { u32 sicfr; u32 siprr[2]; |