From: Shubhrajyoti D Date: Mon, 16 Jan 2012 10:22:36 +0000 (+0530) Subject: omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP. X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3bc4f0d8f65b396d214a31195a91c0394c5bf628;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Greg Kroah-Hartman --- 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);