Merge branch 'akpm-current/current'

[deliverable/linux.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 3ce69536a7b3c3832f652ff7b2c43bd9f0db506e..ff37f6d6e70625f14ee9253baa038587cdd885ce 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2010,6 +2010,8 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
                        name = of_get_property(of_aliases, "stdout", NULL);
                if (name)
                        of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);
+               if (of_stdout)
+                       console_set_by_of();
        }
 
        if (!of_aliases)