aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/netx-serial.c
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2008-10-14 12:13:45 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2008-10-30 04:41:59 -0400
commitfb881f785f0003fc904c6db82909d937d968bcc9 (patch)
treebabde9fd5b4ba606b8372966f4e7a6cd0a4d75d1 /drivers/serial/netx-serial.c
parente946217e4fdaa67681bbabfa8e6b18641921f750 (diff)
[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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 3f489329e8d3..3e5dda8518b7 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -42,8 +42,6 @@
42#define SERIAL_NX_MAJOR 204 42#define SERIAL_NX_MAJOR 204
43#define MINOR_START 170 43#define MINOR_START 170
44 44
45#ifdef CONFIG_SERIAL_NETX_CONSOLE
46
47enum uart_regs { 45enum uart_regs {
48 UART_DR = 0x00, 46 UART_DR = 0x00,
49 UART_SR = 0x04, 47 UART_SR = 0x04,
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
528 } 526 }
529}; 527};
530 528
529#ifdef CONFIG_SERIAL_NETX_CONSOLE
530
531static void netx_console_putchar(struct uart_port *port, int ch) 531static void netx_console_putchar(struct uart_port *port, int ch)
532{ 532{
533 while (readl(port->membase + UART_FR) & FR_BUSY); 533 while (readl(port->membase + UART_FR) & FR_BUSY);