diff options
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index 33b34a58fc62..5b9dce17f0c9 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -372,6 +372,8 @@ void __init find_legacy_serial_ports(void)  	/* Now find out if one of these is out firmware console */  	path = of_get_property(of_chosen, "linux,stdout-path", NULL); +	if (path == NULL) +		path = of_get_property(of_chosen, "stdout-path", NULL);  	if (path != NULL) {  		stdout = of_find_node_by_path(path);  		if (stdout) @@ -595,8 +597,10 @@ static int __init check_legacy_serial_console(void)  	/* We are getting a weird phandle from OF ... */  	/* ... So use the full path instead */  	name = of_get_property(of_chosen, "linux,stdout-path", NULL); +	if (name == NULL) +		name = of_get_property(of_chosen, "stdout-path", NULL);  	if (name == NULL) { -		DBG(" no linux,stdout-path !\n"); +		DBG(" no stdout-path !\n");  		return -ENODEV;  	}  	prom_stdout = of_find_node_by_path(name);  | 
