diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-11-12 21:46:52 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-13 00:22:44 -0500 |
commit | b7a2da1199d2ba2a870b137d6b4c2a538ab68c38 (patch) | |
tree | 3fa712e53a224e21a8a188969b44ab11047a3fff /arch | |
parent | 0302f12e1c72e450d3b4569d9c03c57c9b5edac1 (diff) |
[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')
-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) | |||
186 | pitch = *prop; | 186 | pitch = *prop; |
187 | if (pitch == 1) | 187 | if (pitch == 1) |
188 | pitch = 0x1000; | 188 | pitch = 0x1000; |
189 | prop = of_get_property(np, "address", NULL); | 189 | prop = of_get_property(np, "linux,bootx-addr", NULL); |
190 | if (prop == NULL) | ||
191 | prop = of_get_property(np, "address", NULL); | ||
190 | if (prop) | 192 | if (prop) |
191 | address = *prop; | 193 | address = *prop; |
192 | 194 | ||