aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/setup.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index dc55e1abc45b..0eb0b7085e6a 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -602,7 +602,19 @@ void parse_bootinfo(struct bi_record *rec)
602#endif /* CONFIG_BLK_DEV_INITRD */ 602#endif /* CONFIG_BLK_DEV_INITRD */
603#ifdef CONFIG_PPC_MULTIPLATFORM 603#ifdef CONFIG_PPC_MULTIPLATFORM
604 case BI_MACHTYPE: 604 case BI_MACHTYPE:
605 _machine = data[0]; 605 /* Machine types changed with the merge. Since the
606 * bootinfo are now deprecated, we can just hard code
607 * the appropriate conversion here for when we are
608 * called with yaboot which passes us a machine type
609 * this way.
610 */
611 switch(data[0]) {
612 case 1: _machine = _MACH_prep; break;
613 case 2: _machine = _MACH_Pmac; break;
614 case 4: _machine = _MACH_chrp; break;
615 default:
616 _machine = data[0];
617 }
606 break; 618 break;
607#endif 619#endif
608 case BI_MEMSIZE: 620 case BI_MEMSIZE: