Merge commit 'v2.6.38-rc2' into topic/misc

1 files changed, 0 insertions, 11 deletions

diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index 1106fd99627f..a138e14bad2e 100644
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -75,14 +75,6 @@ static void gamecube_shutdown(void)
         flipper_quiesce();
 }
 
-#ifdef CONFIG_KEXEC
-static int gamecube_kexec_prepare(struct kimage *image)
-{
-        return 0;
-}
-#endif /* CONFIG_KEXEC */
-
-
 define_machine(gamecube) {
         .name                   = "gamecube",
         .probe                  = gamecube_probe,
@@ -95,9 +87,6 @@ define_machine(gamecube) {
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
         .machine_shutdown       = gamecube_shutdown,
-#ifdef CONFIG_KEXEC
-        .machine_kexec_prepare  = gamecube_kexec_prepare,
-#endif
 };