---

yaml --- r: 287052 b: refs/heads/master c: 3bc4f0d h: refs/heads/master v: v3
git-mirror · Jan 24, 2012 · c8512c7 · c8512c7
1 parent 1090006
commit c8512c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eee50af5b13e00b3fb7a5fe8480419a71b8235d
+refs/heads/master: 3bc4f0d8f65b396d214a31195a91c0394c5bf628
diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/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);