tree cf3ada1d0edc3c7b9e0955455056a0048a864710
parent c5e2aa84421b18132d23ca62b6240b1e393d4432
author Benjamin Herrenschmidt <[EMAIL PROTECTED]> Tue Apr 12 08:25:10 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:10 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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 prom.c |    6 ------
 1 files changed, 6 deletions(-)

Index: arch/ppc64/kernel/prom.c
===================================================================
--- bdbdab3160cccb7a595034ecc7695a10b59ae038/arch/ppc64/kernel/prom.c  
(mode:100644 sha1:5f449b4f00b1fe8cc28c9e0c88c04c5df38f6431)
+++ cf3ada1d0edc3c7b9e0955455056a0048a864710/arch/ppc64/kernel/prom.c  
(mode:100644 sha1:6cbed36e7336603d89a31541f95992a351e151f7)
@@ -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

Reply via email to