[patch 052/198] ppc64: remove bogus f50 hack in prom.c

[akpm]

From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>

The code that parses the OF device tree contains an old bogus hack which
was killed a long time ago on ppc32, but survived in ppc64.  It was
supposed to help with a problem on the f50 which is ...  a 32 bits machine
:) Additionally, that hack is causing problems, so let's just get rid of
it.

Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 25-akpm/arch/ppc64/kernel/prom.c |    6 ------
 1 files changed, 6 deletions(-)

diff -puN arch/ppc64/kernel/prom.c~ppc64-remove-bogus-f50-hack-in-promc arch/ppc64/kernel/prom.c
--- 25/arch/ppc64/kernel/prom.c~ppc64-remove-bogus-f50-hack-in-promc	2005-04-12 03:21:15.945712784 -0700
+++ 25-akpm/arch/ppc64/kernel/prom.c	2005-04-12 03:21:15.949712176 -0700
@@ -544,12 +544,6 @@ static int __devinit finish_node(struct 
 	if (ip != NULL)
 		nsizec = *ip;
 
-	/* the f50 sets the name to 'display' and 'compatible' to what we
-	 * expect for the name -- Cort
-	 */
-	if (!strcmp(np->name, "display"))
-		np->name = get_property(np, "compatible", NULL);
-
 	if (!strcmp(np->name, "device-tree") || np->parent == NULL)
 		ifunc = interpret_root_props;
 	else if (np->type == 0)
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/