diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2008-06-29 23:38:38 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2008-06-29 23:38:38 +0200 |
| commit | dc1493aff0330130b2606d8accb458b1fef129a7 (patch) | |
| tree | 954af95d77a9a74c50a328de13bb13d9a1024cd3 /arch/cris | |
| parent | bdb144b67a7660ce5d044ae9a2fd1a8030f12523 (diff) | |
| parent | 3aa30df3d0d78f568cff9d6a98ae01ae55494f10 (diff) | |
| download | blackbird-op-linux-dc1493aff0330130b2606d8accb458b1fef129a7.tar.gz blackbird-op-linux-dc1493aff0330130b2606d8accb458b1fef129a7.zip | |
Merge branch 'cris_debug_port_fix' into cris
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v10/kernel/debugport.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c index 04d5eee2c90c..162730eb887b 100644 --- a/arch/cris/arch-v10/kernel/debugport.c +++ b/arch/cris/arch-v10/kernel/debugport.c @@ -426,12 +426,18 @@ static int dummy_write(struct tty_struct * tty, return count; } -static int -dummy_write_room(struct tty_struct *tty) +static int dummy_write_room(struct tty_struct *tty) { return 8192; } +static const struct tty_operations dummy_ops = { + .open = dummy_open, + .close = dummy_close, + .write = dummy_write, + .write_room = dummy_write_room, +}; + void __init init_dummy_console(void) { @@ -444,14 +450,14 @@ init_dummy_console(void) dummy_driver.type = TTY_DRIVER_TYPE_SERIAL; dummy_driver.subtype = SERIAL_TYPE_NORMAL; dummy_driver.init_termios = tty_std_termios; + /* Normally B9600 default... */ dummy_driver.init_termios.c_cflag = - B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */ + B115200 | CS8 | CREAD | HUPCL | CLOCAL; dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; + dummy_driver.init_termios.c_ispeed = 115200; + dummy_driver.init_termios.c_ospeed = 115200; - dummy_driver.open = dummy_open; - dummy_driver.close = dummy_close; - dummy_driver.write = dummy_write; - dummy_driver.write_room = dummy_write_room; + dummy_driver.ops = &dummy_ops; if (tty_register_driver(&dummy_driver)) panic("Couldn't register dummy serial driver\n"); } |
