diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2008-10-14 18:13:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2008-10-30 09:41:59 +0100 |
| commit | fb881f785f0003fc904c6db82909d937d968bcc9 (patch) | |
| tree | babde9fd5b4ba606b8372966f4e7a6cd0a4d75d1 /drivers/serial/netx-serial.c | |
| parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) | |
| download | op-kernel-dev-fb881f785f0003fc904c6db82909d937d968bcc9.zip op-kernel-dev-fb881f785f0003fc904c6db82909d937d968bcc9.tar.gz | |
[ARM] build fixes for netX serial driver
Make the netX serial driver tristate (as the help text implied). Make the
serial driver build correctly if the netX serial console is disabled. Do not
allow the netX serial console if the netX serial driver is build as a module.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/serial/netx-serial.c')
| -rw-r--r-- | drivers/serial/netx-serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c index 3f48932..3e5dda8 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); |
