diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-11-13 13:46:52 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-13 16:22:44 +1100 |
| commit | b7a2da1199d2ba2a870b137d6b4c2a538ab68c38 (patch) | |
| tree | 3fa712e53a224e21a8a188969b44ab11047a3fff /arch/powerpc | |
| parent | 0302f12e1c72e450d3b4569d9c03c57c9b5edac1 (diff) | |
| download | linux-b7a2da1199d2ba2a870b137d6b4c2a538ab68c38.tar.gz linux-b7a2da1199d2ba2a870b137d6b4c2a538ab68c38.tar.bz2 linux-b7a2da1199d2ba2a870b137d6b4c2a538ab68c38.zip | |
[POWERPC] Fix early btext debug on PowerMac
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>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/btext.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index 3ef51fb6f107..9c74fdf29eec 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c @@ -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; |