Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53
b: refs/heads/master
c: 50bfb2e
h: refs/heads/master
i:
  51: ee5177d
v: v3
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Apr 16, 2005
1 parent 461dff6 commit 05bbdac
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 187335a4ec72c9bc7f3f168d6858a41fcfb63302
refs/heads/master: 50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7
6 changes: 0 additions & 6 deletions trunk/arch/ppc64/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 05bbdac

Please sign in to comment.