Merge branch 'next-samsung-board-v3.1' into next-samsung-board

[~andy/linux] / kernel / printk.c

diff --git a/kernel/printk.c b/kernel/printk.c
index 836a2ae0ac31c9120e362bad14254c3e2247eb25..28a40d8171b8e67488efc6f383736d5f7532c5ff 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1604,7 +1604,7 @@ static int __init printk_late_init(void)
        struct console *con;
 
        for_each_console(con) {
-               if (con->flags & CON_BOOT) {
+               if (!keep_bootcon && con->flags & CON_BOOT) {
                        printk(KERN_INFO "turn off boot console %s%d\n",
                                con->name, con->index);
                        unregister_console(con);