From: Benjamin Herrenschmidt Date: Sat, 16 Apr 2005 22:24:37 +0000 (-0700) Subject: [PATCH] ppc64: remove bogus f50 hack in prom.c X-Git-Tag: v2.6.12-rc3~193 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7;p=linux-2.6 [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index b08aac68ba..45a4ad08fb 100644 --- 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)