Merge 3.4-rc3 into tty-next
This allows us to pick up some changes needed for other serial patches. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -2932,11 +2932,10 @@ static int __init con_init(void)
|
||||
gotoxy(vc, vc->vc_x, vc->vc_y);
|
||||
csi_J(vc, 0);
|
||||
update_screen(vc);
|
||||
pr_info("Console: %s %s %dx%d",
|
||||
pr_info("Console: %s %s %dx%d\n",
|
||||
vc->vc_can_do_color ? "colour" : "mono",
|
||||
display_desc, vc->vc_cols, vc->vc_rows);
|
||||
printable = 1;
|
||||
printk("\n");
|
||||
|
||||
console_unlock();
|
||||
|
||||
|
Reference in New Issue
Block a user