From: Arnd Bergmann Date: Tue, 18 Feb 2014 15:14:20 +0000 (+0100) Subject: serial: pxa: fix build with !SERIAL_PXA_CONSOLE X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2ee881b74e1fa96bfe0c7d2be11f6de69bc145e9;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index c638c53cd2b6..21b7d8b86493 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