diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-04-16 15:24:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:24:37 -0700 |
| commit | 50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7 (patch) | |
| tree | 5f1ee34e30c360ff7edd39753313b8c4e3410220 /arch/ppc64 | |
| parent | 187335a4ec72c9bc7f3f168d6858a41fcfb63302 (diff) | |
| download | talos-obmc-linux-50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7.tar.gz talos-obmc-linux-50bfb2e0329d45dd46fdc34f70cdaabe2d8a1dc7.zip | |
[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>
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/kernel/prom.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c index b08aac68baff..45a4ad08fbc2 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) |
