From 385665d2e0637eae6879f09a038e3c170b31e376 Mon Sep 17 00:00:00 2001
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Date: Wed, 16 Jan 2013 14:08:15 +0200
Subject: [PATCH] --- yaml --- r: 354799 b: refs/heads/master c:
 053fac36b1d9f76adde96a2f731965aaab3c632b h: refs/heads/master i:   354797:
 2e842392983e35e8316e5d283a48a91e33850c05   354795:
 ac3acaf4bd6adafbb733256a39c4bb5a2313bb51   354791:
 40d6ad8de136eafd2adbde5168d38519902250ae   354783:
 a4654418e526f74431286864b2f18fa905d32cdc v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/tty/serial/8250/8250_dw.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 21fde7a8ed51..4ab21020c3c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3b0397fdf19b3c23f37012532482c787e01d4a0
+refs/heads/master: 053fac36b1d9f76adde96a2f731965aaab3c632b
diff --git a/trunk/drivers/tty/serial/8250/8250_dw.c b/trunk/drivers/tty/serial/8250/8250_dw.c
index ceacf5e36f2e..bfdaf8b2680b 100644
--- a/trunk/drivers/tty/serial/8250/8250_dw.c
+++ b/trunk/drivers/tty/serial/8250/8250_dw.c
@@ -145,6 +145,7 @@ static int dw8250_probe_of(struct uart_port *p)
 	return 0;
 }
 
+#ifdef CONFIG_ACPI
 static bool dw8250_acpi_dma_filter(struct dma_chan *chan, void *parm)
 {
 	return chan->chan_id == *(int *)parm;
@@ -231,6 +232,12 @@ static int dw8250_probe_acpi(struct uart_port *p)
 
 	return 0;
 }
+#else
+static inline int dw8250_probe_acpi(struct uart_port *p)
+{
+	return -ENODEV;
+}
+#endif /* CONFIG_ACPI */
 
 static void dw8250_setup_port(struct uart_8250_port *up)
 {