summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/pxa.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-02-18 16:14:20 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-10 15:48:41 -0700
commit2ee881b74e1fa96bfe0c7d2be11f6de69bc145e9 (patch)
treefcf38503d5616710eed208500f53b69f1cce76dd /drivers/tty/serial/pxa.c
parent9da433c0a0b5f71ac92dc9dca778295649675f08 (diff)
downloadop-kernel-dev-2ee881b74e1fa96bfe0c7d2be11f6de69bc145e9.zip
op-kernel-dev-2ee881b74e1fa96bfe0c7d2be11f6de69bc145e9.tar.gz
serial: pxa: fix build with !SERIAL_PXA_CONSOLE
When CONFIG_SERIAL_PXA_CONSOLE is disabled, the serial_pxa_get_poll_char and serial_pxa_put_poll_char functions are not defined, and we can't reference them. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/pxa.c')
-rw-r--r--drivers/tty/serial/pxa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index c638c53..21b7d8b 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -778,7 +778,7 @@ static struct uart_ops serial_pxa_pops = {
.request_port = serial_pxa_request_port,
.config_port = serial_pxa_config_port,
.verify_port = serial_pxa_verify_port,
-#ifdef CONFIG_CONSOLE_POLL
+#if defined(CONFIG_CONSOLE_POLL) && defined(CONFIG_SERIAL_PXA_CONSOLE)
.poll_get_char = serial_pxa_get_poll_char,
.poll_put_char = serial_pxa_put_poll_char,
#endif
OpenPOWER on IntegriCloud