diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/Kconfig | 4 | ||||
-rw-r--r-- | drivers/serial/netx-serial.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index c94d3c4b7521..579d63a81aa2 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3 | |||
1276 | say Y or M. Otherwise, say N. | 1276 | say Y or M. Otherwise, say N. |
1277 | 1277 | ||
1278 | config SERIAL_NETX | 1278 | config SERIAL_NETX |
1279 | bool "NetX serial port support" | 1279 | tristate "NetX serial port support" |
1280 | depends on ARM && ARCH_NETX | 1280 | depends on ARM && ARCH_NETX |
1281 | select SERIAL_CORE | 1281 | select SERIAL_CORE |
1282 | help | 1282 | help |
@@ -1288,7 +1288,7 @@ config SERIAL_NETX | |||
1288 | 1288 | ||
1289 | config SERIAL_NETX_CONSOLE | 1289 | config SERIAL_NETX_CONSOLE |
1290 | bool "Console on NetX serial port" | 1290 | bool "Console on NetX serial port" |
1291 | depends on SERIAL_NETX | 1291 | depends on SERIAL_NETX=y |
1292 | select SERIAL_CORE_CONSOLE | 1292 | select SERIAL_CORE_CONSOLE |
1293 | help | 1293 | help |
1294 | If you have enabled the serial port on the Hilscher NetX SoC | 1294 | If you have enabled the serial port on the Hilscher NetX SoC |
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); |