aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-01 17:02:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-01 17:02:13 -0700
commitb620cc2cd80393b9a0f9a76806cb7f9e91671dac (patch)
tree6291cc977570bfbdd209fb55602806b8f4cd8d11 /drivers
parent036bfdcb0dfa39fc1ff5ded196b5fd92f1bb9ea8 (diff)
parent31f919c3296a30427b18458b13c308513a62c3b9 (diff)
downloadlinux-b620cc2cd80393b9a0f9a76806cb7f9e91671dac.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 4c985e6b3784b0..4e1e80adaf11f4 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -860,7 +860,7 @@ imx_console_setup(struct console *co, char *options)
return uart_set_options(&sport->port, co, baud, parity, bits, flow);
}
-extern struct uart_driver imx_reg;
+static struct uart_driver imx_reg;
static struct console imx_console = {
.name = "ttySMX",
.write = imx_console_write,