diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 00:55:22 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 00:55:22 -0400 |
| commit | 617e44fdfd7ee3d53388ab295d9411b826437ce9 (patch) | |
| tree | ed6bd2a5960f706fa93c6df2cbfb75ede926fd1c /drivers/serial/m32r_sio.c | |
| parent | 4887f76ec3d38e99286c9d0fdd6a719174d02e44 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/serial/m32r_sio.c')
| -rw-r--r-- | drivers/serial/m32r_sio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 0301feacbde4..9b50560b9d16 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
| @@ -1123,7 +1123,7 @@ static int __init m32r_sio_console_setup(struct console *co, char *options) | |||
| 1123 | return uart_set_options(port, co, baud, parity, bits, flow); | 1123 | return uart_set_options(port, co, baud, parity, bits, flow); |
| 1124 | } | 1124 | } |
| 1125 | 1125 | ||
| 1126 | extern struct uart_driver m32r_sio_reg; | 1126 | static struct uart_driver m32r_sio_reg; |
| 1127 | static struct console m32r_sio_console = { | 1127 | static struct console m32r_sio_console = { |
| 1128 | .name = "ttyS", | 1128 | .name = "ttyS", |
| 1129 | .write = m32r_sio_console_write, | 1129 | .write = m32r_sio_console_write, |