diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/serial/imx.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/serial/imx.c')
| -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, |