diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-30 11:04:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 11:04:22 -0400 |
| commit | ab3bd08a257d4b92384de2720b7294b444578ba5 (patch) | |
| tree | 65ef68d6c3861b5b5d84d3876cde0941694f2c88 /drivers/serial/netx-serial.c | |
| parent | 9c6568501cbf731a910db2fcb7d094977dcb154c (diff) | |
| parent | 2eca047b289307594d0d6ce62c8237fa9c5b9b5e (diff) | |
Merge branch 'for-rmk-rc' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
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 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 | |||
| 47 | enum uart_regs { | 45 | enum 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 | |||
| 531 | static void netx_console_putchar(struct uart_port *port, int ch) | 531 | static 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); |