From 20bc48b737631df89d6eba966b87c78256a33013 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Mon, 14 Apr 2008 02:52:38 +1000
Subject: [PATCH] --- yaml --- r: 91551 b: refs/heads/master c:
 7f4392cdcc63fea72fc77d14497059267d77d5d0 h: refs/heads/master i:   91549:
 1515a29a85d6777e1cab6d4d650aa6a8c35a1172   91547:
 92b9b2867315dd314e480873648c6ce504b07bde   91543:
 72d88be132a96d2e376a75c1a8e1aff390d8cb4d   91535:
 259c5f7ed8a41797f4061878a57e979828673d6d   91519:
 a3321f542cdcfa186ac5661a2ce3c53e8d4551ae v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/kernel/prom_init.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a7ce6b993665..5bbb7b92723f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612212a3f2f053ea68ce9cd16d3deeca7754e8c9
+refs/heads/master: 7f4392cdcc63fea72fc77d14497059267d77d5d0
diff --git a/trunk/arch/powerpc/kernel/prom_init.c b/trunk/arch/powerpc/kernel/prom_init.c
index 5ab4c8466cc9..6d6df1e60325 100644
--- a/trunk/arch/powerpc/kernel/prom_init.c
+++ b/trunk/arch/powerpc/kernel/prom_init.c
@@ -2240,6 +2240,14 @@ static void __init fixup_device_tree_efika(void)
 	if (rv != PROM_ERROR && (strcmp(prop, "chrp") == 0))
 		prom_setprop(node, "/", "device_type", "efika", sizeof("efika"));
 
+	/* CODEGEN,description is exposed in /proc/cpuinfo so
+	   fix that too */
+	rv = prom_getprop(node, "CODEGEN,description", prop, sizeof(prop));
+	if (rv != PROM_ERROR && (strstr(prop, "CHRP")))
+		prom_setprop(node, "/", "CODEGEN,description",
+			     "Efika 5200B PowerPC System",
+			     sizeof("Efika 5200B PowerPC System"));
+
 	/* Fixup bestcomm interrupts property */
 	node = call_prom("finddevice", 1, 1, ADDR("/builtin/bestcomm"));
 	if (PHANDLE_VALID(node)) {