aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc64/kernel/setup.c')
-rw-r--r--arch/ppc64/kernel/setup.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index acf826043e39..6c1cd3bab28e 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -309,13 +309,11 @@ static void __init setup_cpu_maps(void)
309} 309}
310#endif /* CONFIG_SMP */ 310#endif /* CONFIG_SMP */
311 311
312
313#ifdef CONFIG_PPC_MULTIPLATFORM
314
315extern struct machdep_calls pSeries_md; 312extern struct machdep_calls pSeries_md;
316extern struct machdep_calls pmac_md; 313extern struct machdep_calls pmac_md;
317extern struct machdep_calls maple_md; 314extern struct machdep_calls maple_md;
318extern struct machdep_calls bpa_md; 315extern struct machdep_calls bpa_md;
316extern struct machdep_calls iseries_md;
319 317
320/* Ultimately, stuff them in an elf section like initcalls... */ 318/* Ultimately, stuff them in an elf section like initcalls... */
321static struct machdep_calls __initdata *machines[] = { 319static struct machdep_calls __initdata *machines[] = {
@@ -331,6 +329,9 @@ static struct machdep_calls __initdata *machines[] = {
331#ifdef CONFIG_PPC_BPA 329#ifdef CONFIG_PPC_BPA
332 &bpa_md, 330 &bpa_md,
333#endif 331#endif
332#ifdef CONFIG_PPC_ISERIES
333 &iseries_md,
334#endif
334 NULL 335 NULL
335}; 336};
336 337
@@ -534,8 +535,6 @@ static void __init check_for_initrd(void)
534#endif /* CONFIG_BLK_DEV_INITRD */ 535#endif /* CONFIG_BLK_DEV_INITRD */
535} 536}
536 537
537#endif /* CONFIG_PPC_MULTIPLATFORM */
538
539/* 538/*
540 * Do some initial setup of the system. The parameters are those which 539 * Do some initial setup of the system. The parameters are those which
541 * were passed in from the bootloader. 540 * were passed in from the bootloader.