tree 5f1ee34e30c360ff7edd39753313b8c4e3410220
parent 187335a4ec72c9bc7f3f168d6858a41fcfb63302
author Benjamin Herrenschmidt <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:37
-0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:37 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
ppc64/kernel/prom.c | 6 ------
1 files changed, 6 deletions(-)
Index: arch/ppc64/kernel/prom.c
===================================================================
--- d5f1ae0d320e6325ed056469773e855fc635c53d/arch/ppc64/kernel/prom.c
(mode:100644 sha1:b08aac68baff4a3c2b59f3337ea4b98cf60b64a3)
+++ 5f1ee34e30c360ff7edd39753313b8c4e3410220/arch/ppc64/kernel/prom.c
(mode:100644 sha1:45a4ad08fbc2c921c21f7598b0647ef02a6fec25)
@@ -544,12 +544,6 @@
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)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
