summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>2013-11-26 10:30:06 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-08 16:44:21 -0800
commit8913a316e3f74b800c3a4e0d4c85cab26bbb9c53 (patch)
tree3fce7c0ada1157b7e9313b991caed45bff27962d
parent42b6a1baa3ec18de2eb15baa250da6203eeb2d39 (diff)
downloadlinux-8913a316e3f74b800c3a4e0d4c85cab26bbb9c53.tar.gz
linux-8913a316e3f74b800c3a4e0d4c85cab26bbb9c53.tar.bz2
linux-8913a316e3f74b800c3a4e0d4c85cab26bbb9c53.zip
serial: 8250_dw: remove ACPI ifdef
ACPI now provides stubs for the functions the driver uses. Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_dw.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index 4658e3e0ec42..816ec88a0d7f 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -272,7 +272,6 @@ static int dw8250_probe_of(struct uart_port *p,
return 0;
}
-#ifdef CONFIG_ACPI
static int dw8250_probe_acpi(struct uart_8250_port *up,
struct dw8250_data *data)
{
@@ -300,13 +299,6 @@ static int dw8250_probe_acpi(struct uart_8250_port *up,
return 0;
}
-#else
-static inline int dw8250_probe_acpi(struct uart_8250_port *up,
- struct dw8250_data *data)
-{
- return -ENODEV;
-}
-#endif /* CONFIG_ACPI */
static int dw8250_probe(struct platform_device *pdev)
{