[PATCH] ppc64: remove bogus f50 hack in prom.c

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@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
index b08aac68baff4a3c2b59f3337ea4b98cf60b64a3..45a4ad08fbc2c921c21f7598b0647ef02a6fec25 100644 (file)
--- a/arch/ppc64/kernel/prom.c
+++ b/arch/ppc64/kernel/prom.c
@@ -544,12 +544,6 @@ static int __devinit finish_node(struct device_node *np,
        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)