diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/setup.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 89c4c3636161..616b1e3ebe04 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
@@ -88,11 +88,10 @@ int ppc_override_l2cr = 0; | |||
88 | int ppc_override_l2cr_value; | 88 | int ppc_override_l2cr_value; |
89 | int has_l2cache = 0; | 89 | int has_l2cache = 0; |
90 | 90 | ||
91 | int pmac_newworld = 1; | 91 | int pmac_newworld; |
92 | 92 | ||
93 | static int current_root_goodness = -1; | 93 | static int current_root_goodness = -1; |
94 | 94 | ||
95 | extern int pmac_newworld; | ||
96 | extern struct machdep_calls pmac_md; | 95 | extern struct machdep_calls pmac_md; |
97 | 96 | ||
98 | #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */ | 97 | #define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */ |
@@ -310,9 +309,10 @@ static void __init pmac_setup_arch(void) | |||
310 | for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; ) | 309 | for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; ) |
311 | if (get_property(ic, "interrupt-controller", NULL)) | 310 | if (get_property(ic, "interrupt-controller", NULL)) |
312 | break; | 311 | break; |
313 | pmac_newworld = (ic != NULL); | 312 | if (ic) { |
314 | if (ic) | 313 | pmac_newworld = 1; |
315 | of_node_put(ic); | 314 | of_node_put(ic); |
315 | } | ||
316 | 316 | ||
317 | /* Lookup PCI hosts */ | 317 | /* Lookup PCI hosts */ |
318 | pmac_pci_init(); | 318 | pmac_pci_init(); |