aboutsummaryrefslogtreecommitdiff
path: root/drivers/serial/netx-serial.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-31 14:33:41 +0000
committerBen Dooks <ben-linux@fluff.org>2008-10-31 14:33:41 +0000
commit828d9982ebf994a20293b79e9773039f1d74d44f (patch)
treecd0d489f392c63e73e2d938ef99eecc342a21e04 /drivers/serial/netx-serial.c
parentebfa200c1c2d8a0a0634ebd7a24123f9a0404a5c (diff)
parent721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'drivers/serial/netx-serial.c')
-rw-r--r--drivers/serial/netx-serial.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 3f489329e8d..3e5dda8518b 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -42,8 +42,6 @@
#define SERIAL_NX_MAJOR 204
#define MINOR_START 170
-#ifdef CONFIG_SERIAL_NETX_CONSOLE
-
enum uart_regs {
UART_DR = 0x00,
UART_SR = 0x04,
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
}
};
+#ifdef CONFIG_SERIAL_NETX_CONSOLE
+
static void netx_console_putchar(struct uart_port *port, int ch)
{
while (readl(port->membase + UART_FR) & FR_BUSY);