projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0eee50a
)
omap-serial :Make the suspend/resume functions depend on CONFIG_PM_SLEEP.
author
Shubhrajyoti D
<
[email protected]
>
Mon, 16 Jan 2012 10:22:36 +0000
(15:52 +0530)
committer
Greg Kroah-Hartman
<
[email protected]
>
Tue, 24 Jan 2012 22:11:05 +0000
(14:11 -0800)
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 <
[email protected]
>
Signed-off-by: Greg Kroah-Hartman <
[email protected]
>
drivers/tty/serial/omap-serial.c
patch
|
blob
|
history
diff --git
a/drivers/tty/serial/omap-serial.c
b/drivers/tty/serial/omap-serial.c
index d192dcbb82f5e464f9ab6beb8805a2dcd1c6733b..33e3360023b38229ec9bd0f173c2f57d4b73d8ce 100644
(file)
--- 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);