From 459481613f9818c6c6ecf37040e9ee71df46303f Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 15 Nov 2005 18:21:45 +1100
Subject: [PATCH] --- yaml --- r: 14267 b: refs/heads/master c:
 de93f0d62ccaa730fd46de14d46c0317bd82596a h: refs/heads/master i:   14265:
 94088a653629222a699c5401925dace8f5b4c2e0   14263:
 e8dd657bc8e2796f23fe25114aa127fa97e2c59a v: v3

---
 [refs]                        |  2 +-
 trunk/arch/ppc/kernel/setup.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3aa2e27503b5..36991fcae1d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0ce5c5228dd17d4e3dd1d15b8d52714262cab70
+refs/heads/master: de93f0d62ccaa730fd46de14d46c0317bd82596a
diff --git a/trunk/arch/ppc/kernel/setup.c b/trunk/arch/ppc/kernel/setup.c
index dc55e1abc45b..0eb0b7085e6a 100644
--- a/trunk/arch/ppc/kernel/setup.c
+++ b/trunk/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: