summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorShubhrajyoti D <shubhrajyoti@ti.com>2012-01-16 15:52:36 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-24 14:11:05 -0800
commit3bc4f0d8f65b396d214a31195a91c0394c5bf628 (patch)
tree58b07352199d78fdaecd00bc01da314c8a3968e2 /drivers/tty
parent0eee50af5b13e00b3fb7a5fe8480419a71b8235d (diff)
omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP.
The macro SET_SYSTEM_SLEEP_PM_OPS depends CONFIG_PM_SLEEP. The patch defines the suspend and resume functions for CONFIG_PM_SLEEP instead of CONFIG_SUSPEND. Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/omap-serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index d192dcbb82f..33e3360023b 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1160,7 +1160,7 @@ static struct uart_driver serial_omap_reg = {
.cons = OMAP_CONSOLE,
};
-#ifdef CONFIG_SUSPEND
+#ifdef CONFIG_PM_SLEEP
static int serial_omap_suspend(struct device *dev)
{
struct uart_omap_port *up = dev_get_drvdata(dev);