Merge branch 'master' of ../mmc

[pandora-kernel.git] / arch / powerpc / platforms / powermac / setup.c

diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 82c14d2..9b78f53 100644 (file)
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -60,7 +60,6 @@
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
-#include <asm/kexec.h>
 #include <asm/pci-bridge.h>
 #include <asm/ohare.h>
 #include <asm/mediabay.h>
@@ -310,9 +309,7 @@ static void __init pmac_setup_arch(void)
        }
 
        /* See if newworld or oldworld */
-       for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; )
-               if (of_get_property(ic, "interrupt-controller", NULL))
-                       break;
+       ic = of_find_node_with_property(NULL, "interrupt-controller");
        if (ic) {
                pmac_newworld = 1;
                of_node_put(ic);
@@ -740,11 +737,6 @@ define_machine(powermac) {
        .pci_probe_mode         = pmac_pci_probe_mode,
        .power_save             = power4_idle,
        .enable_pmcs            = power4_enable_pmcs,
-#ifdef CONFIG_KEXEC
-       .machine_kexec          = default_machine_kexec,
-       .machine_kexec_prepare  = default_machine_kexec_prepare,
-       .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
 #endif /* CONFIG_PPC64 */
 #ifdef CONFIG_PPC32
        .pcibios_enable_device_hook = pmac_pci_enable_device_hook,