]> err.no Git - linux-2.6/commitdiff
[POWERPC] Fix early btext debug on PowerMac
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 13 Nov 2007 02:46:52 +0000 (13:46 +1100)
committerPaul Mackerras <paulus@samba.org>
Tue, 13 Nov 2007 05:22:44 +0000 (16:22 +1100)
The early btext debug wouldn't work on PowerMac when booted from BootX
due to the code looking for the wrong property name.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/btext.c

index 3ef51fb6f107a57d3ca82f4c18ddfd84f689ce3a..9c74fdf29eeccc8f5c56adb7b1a5c98fc09a21e3 100644 (file)
@@ -186,7 +186,9 @@ int btext_initialize(struct device_node *np)
                pitch = *prop;
        if (pitch == 1)
                pitch = 0x1000;
-       prop = of_get_property(np, "address", NULL);
+       prop = of_get_property(np, "linux,bootx-addr", NULL);
+       if (prop == NULL)
+               prop = of_get_property(np, "address", NULL);
        if (prop)
                address = *prop;