diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-12-16 01:23:08 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-12-22 23:13:28 -0500 |
commit | 5be8554875bf3a1a42b7f04d5999b36e7c2fa88b (patch) | |
tree | 265fd331230556b6c3b226d0b7ffefdefcea2ffb /arch/powerpc/platforms/powermac | |
parent | 77733f8a33488307e7d4b9077d174647ecea92e1 (diff) |
powerpc: Remove default kexec/crash_kernel ops assignments
Default ops are implicit now.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 12937725f86..9b78f5300c2 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -60,7 +60,6 @@ | |||
60 | #include <asm/system.h> | 60 | #include <asm/system.h> |
61 | #include <asm/pgtable.h> | 61 | #include <asm/pgtable.h> |
62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
63 | #include <asm/kexec.h> | ||
64 | #include <asm/pci-bridge.h> | 63 | #include <asm/pci-bridge.h> |
65 | #include <asm/ohare.h> | 64 | #include <asm/ohare.h> |
66 | #include <asm/mediabay.h> | 65 | #include <asm/mediabay.h> |
@@ -738,11 +737,6 @@ define_machine(powermac) { | |||
738 | .pci_probe_mode = pmac_pci_probe_mode, | 737 | .pci_probe_mode = pmac_pci_probe_mode, |
739 | .power_save = power4_idle, | 738 | .power_save = power4_idle, |
740 | .enable_pmcs = power4_enable_pmcs, | 739 | .enable_pmcs = power4_enable_pmcs, |
741 | #ifdef CONFIG_KEXEC | ||
742 | .machine_kexec = default_machine_kexec, | ||
743 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
744 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
745 | #endif | ||
746 | #endif /* CONFIG_PPC64 */ | 740 | #endif /* CONFIG_PPC64 */ |
747 | #ifdef CONFIG_PPC32 | 741 | #ifdef CONFIG_PPC32 |
748 | .pcibios_enable_device_hook = pmac_pci_enable_device_hook, | 742 | .pcibios_enable_device_hook = pmac_pci_enable_device_hook, |