From 05bbdac4501832103726ceefb6cc9d9ed6020d5c Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sat, 16 Apr 2005 15:24:37 -0700 Subject: [PATCH] --- yaml --- r: 53 b: refs/heads/master c: 50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7 h: refs/heads/master i: 51: ee5177db482e9ffc250308c03a97cd4944344274 v: v3 --- [refs] | 2 +- trunk/arch/ppc64/kernel/prom.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f29fd8989281..2022ce8bc918 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 187335a4ec72c9bc7f3f168d6858a41fcfb63302 +refs/heads/master: 50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7 diff --git a/trunk/arch/ppc64/kernel/prom.c b/trunk/arch/ppc64/kernel/prom.c index b08aac68baff..45a4ad08fbc2 100644 --- a/trunk/arch/ppc64/kernel/prom.c +++ b/trunk/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)