aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2013-01-16 07:08:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 10:36:10 -0500
commit053fac36b1d9f76adde96a2f731965aaab3c632b (patch)
treef4f29ed9df69fcdc5503a24a4d8afd79373604c4 /drivers/tty/serial
parenta3b0397fdf19b3c23f37012532482c787e01d4a0 (diff)
serial: 8250_dw: Use ifdef with ACPI
There are no stubs for ACPI functions so the driver needs to have this ifdef or it will not compile without ACPI. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/8250/8250_dw.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index ceacf5e36f2e..bfdaf8b2680b 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -145,6 +145,7 @@ static int dw8250_probe_of(struct uart_port *p)
145 return 0; 145 return 0;
146} 146}
147 147
148#ifdef CONFIG_ACPI
148static bool dw8250_acpi_dma_filter(struct dma_chan *chan, void *parm) 149static bool dw8250_acpi_dma_filter(struct dma_chan *chan, void *parm)
149{ 150{
150 return chan->chan_id == *(int *)parm; 151 return chan->chan_id == *(int *)parm;
@@ -231,6 +232,12 @@ static int dw8250_probe_acpi(struct uart_port *p)
231 232
232 return 0; 233 return 0;
233} 234}
235#else
236static inline int dw8250_probe_acpi(struct uart_port *p)
237{
238 return -ENODEV;
239}
240#endif /* CONFIG_ACPI */
234 241
235static void dw8250_setup_port(struct uart_8250_port *up) 242static void dw8250_setup_port(struct uart_8250_port *up)
236{ 243{