Merge tag 'nfs-for-3.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[~andy/linux] / drivers / tty / serial / pch_uart.c

diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 5040c517f3b8b9699a42b467b1d841b72b662480..52379e56a31e7abc43a6642a799b1be7744be6c8 100644 (file)
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1524,6 +1524,7 @@ static int pch_uart_verify_port(struct uart_port *port,
        return 0;
 }
 
+#if defined(CONFIG_CONSOLE_POLL) || defined(CONFIG_SERIAL_PCH_UART_CONSOLE)
 /*
  *     Wait for transmitter & holding register to empty
  */
@@ -1554,6 +1555,7 @@ static void wait_for_xmitr(struct eg20t_port *up, int bits)
                }
        }
 }
+#endif /* CONFIG_CONSOLE_POLL || CONFIG_SERIAL_PCH_UART_CONSOLE */
 
 #ifdef CONFIG_CONSOLE_POLL
 /*