Commit 50bfb2e0 authored Apr 16, 2005 by Benjamin Herrenschmidt Committed by Linus Torvalds Apr 16, 2005

[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>

parent 187335a4

arch/ppc64/kernel/prom.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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)

Admin message