diff options
author | Davide Brini <davide.brini@unibo.it> | 2007-05-06 17:51:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:02 -0400 |
commit | 57ac895a7f22d235f637317f58a2d9ba6ec91a27 (patch) | |
tree | 241615a77e09f501cc758bf0780052f859237d2a /arch/um/drivers/ssl.c | |
parent | c74c69b442364125fd13259ecaa4cd2ee43b9172 (diff) |
uml: fix umid in xterm titles
Calls lines_init() *after* xterm_title is modified to include umid.
Signed-off-by: Davide Brini <davide.brini@unibo.it>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Acked-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/drivers/ssl.c')
-rw-r--r-- | arch/um/drivers/ssl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index 94faadc5ea1b..fd09ad9e9c0a 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
@@ -191,12 +191,12 @@ static int ssl_init(void) | |||
191 | ssl_driver = register_lines(&driver, &ssl_ops, serial_lines, | 191 | ssl_driver = register_lines(&driver, &ssl_ops, serial_lines, |
192 | ARRAY_SIZE(serial_lines)); | 192 | ARRAY_SIZE(serial_lines)); |
193 | 193 | ||
194 | lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts); | ||
195 | |||
196 | new_title = add_xterm_umid(opts.xterm_title); | 194 | new_title = add_xterm_umid(opts.xterm_title); |
197 | if (new_title != NULL) | 195 | if (new_title != NULL) |
198 | opts.xterm_title = new_title; | 196 | opts.xterm_title = new_title; |
199 | 197 | ||
198 | lines_init(serial_lines, ARRAY_SIZE(serial_lines), &opts); | ||
199 | |||
200 | ssl_init_done = 1; | 200 | ssl_init_done = 1; |
201 | register_console(&ssl_cons); | 201 | register_console(&ssl_cons); |
202 | return 0; | 202 | return 0; |