diff options
| author | Shubhrajyoti D <shubhrajyoti@ti.com> | 2012-01-16 11:22:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-24 23:11:05 +0100 |
| commit | 3bc4f0d8f65b396d214a31195a91c0394c5bf628 (patch) | |
| tree | 58b07352199d78fdaecd00bc01da314c8a3968e2 | |
| parent | TTY: fix UV serial console regression (diff) | |
| download | linux-3bc4f0d8f65b396d214a31195a91c0394c5bf628.tar.xz linux-3bc4f0d8f65b396d214a31195a91c0394c5bf628.zip | |
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>
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index d192dcbb82f5..33e3360023b3 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); |