Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / powerpc / kernel / crash_dump.c

diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index ffa91d6..29ff77c 100644 (file)
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -54,8 +54,10 @@ void __init setup_kdump_trampoline(void)
                create_trampoline(i);
        }
 
+#ifdef CONFIG_PPC_PSERIES
        create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START);
        create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START);
+#endif /* CONFIG_PPC_PSERIES */
 
        DBG(" <- setup_kdump_trampoline()\n");
 }