From cc3ff3f642c3f9ac07d861774a1efa746b9c95da Mon Sep 17 00:00:00 2001 From: Davide Brini Date: Sun, 6 May 2007 14:51:16 -0700 Subject: [PATCH] --- yaml --- r: 54299 b: refs/heads/master c: 57ac895a7f22d235f637317f58a2d9ba6ec91a27 h: refs/heads/master i: 54297: 1a9367051d58f478b6cb1270db3704ec630ea0ce 54295: 2de53485d372cb17a44dd54efbec3af570563dc9 v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/ssl.c | 4 ++-- trunk/arch/um/drivers/stdio_console.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 63393ff646c0..c0080ae3552b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c74c69b442364125fd13259ecaa4cd2ee43b9172 +refs/heads/master: 57ac895a7f22d235f637317f58a2d9ba6ec91a27 diff --git a/trunk/arch/um/drivers/ssl.c b/trunk/arch/um/drivers/ssl.c index 94faadc5ea1b..fd09ad9e9c0a 100644 --- a/trunk/arch/um/drivers/ssl.c +++ b/trunk/arch/um/drivers/ssl.c @@ -191,12 +191,12 @@ static int ssl_init(void) ssl_driver = register_lines(&driver, &ssl_ops, serial_lines, ARRAY_SIZE(serial_lines)); - lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts); - new_title = add_xterm_umid(opts.xterm_title); if (new_title != NULL) opts.xterm_title = new_title; + lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts); + ssl_init_done = 1; register_console(&ssl_cons); return 0; diff --git a/trunk/arch/um/drivers/stdio_console.c b/trunk/arch/um/drivers/stdio_console.c index 90a2c5cc17d4..2bb4193ac1aa 100644 --- a/trunk/arch/um/drivers/stdio_console.c +++ b/trunk/arch/um/drivers/stdio_console.c @@ -166,12 +166,12 @@ int stdio_init(void) return -1; printk(KERN_INFO "Initialized stdio console driver\n"); - lines_init(vts, ARRAY_SIZE(vts), &opts); - new_title = add_xterm_umid(opts.xterm_title); if(new_title != NULL) opts.xterm_title = new_title; + lines_init(vts, ARRAY_SIZE(vts), &opts); + con_init_done = 1; register_console(&stdiocons); return 0;