Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

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)
 #endif /* CONFIG_BLK_DEV_INITRD */
 #ifdef CONFIG_PPC_MULTIPLATFORM
                 case BI_MACHTYPE:
-                        _machine = data[0];
+                        /* Machine types changed with the merge. Since the
+                         * bootinfo are now deprecated, we can just hard code
+                         * the appropriate conversion here for when we are
+                         * called with yaboot which passes us a machine type
+                         * this way.
+                         */
+                        switch(data[0]) {
+                        case 1: _machine = _MACH_prep; break;
+                        case 2: _machine = _MACH_Pmac; break;
+                        case 4: _machine = _MACH_chrp; break;
+                        default:
+                                _machine = data[0];
+                        }
                         break;
 #endif
                 case BI_MEMSIZE: