---

yaml --- r: 354799 b: refs/heads/master c: 053fac3 h: refs/heads/master i: 354797: 2e84239 354795: ac3acaf 354791: 40d6ad8 354783: a465441 v: v3
git-mirror · Jan 16, 2013 · 385665d · 385665d
1 parent 9420eb8
commit 385665d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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)
 {