diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-01 20:02:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-01 20:02:13 -0400 |
| commit | b620cc2cd80393b9a0f9a76806cb7f9e91671dac (patch) | |
| tree | 6291cc977570bfbdd209fb55602806b8f4cd8d11 /drivers | |
| parent | 036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 (diff) | |
| parent | 31f919c3296a30427b18458b13c308513a62c3b9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 4c985e6b3784..4e1e80adaf11 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -860,7 +860,7 @@ imx_console_setup(struct console *co, char *options) | |||
| 860 | return uart_set_options(&sport->port, co, baud, parity, bits, flow); | 860 | return uart_set_options(&sport->port, co, baud, parity, bits, flow); |
| 861 | } | 861 | } |
| 862 | 862 | ||
| 863 | extern struct uart_driver imx_reg; | 863 | static struct uart_driver imx_reg; |
| 864 | static struct console imx_console = { | 864 | static struct console imx_console = { |
| 865 | .name = "ttySMX", | 865 | .name = "ttySMX", |
| 866 | .write = imx_console_write, | 866 | .write = imx_console_write, |