From ff9bcf7356c4cd3e9199b5452c26960efce84d58 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 19 Jan 2012 11:28:56 -0800
Subject: [PATCH] --- yaml --- r: 287059 b: refs/heads/master c:
 773598357c0baf03081cf87f2b444f97744faf1e h: refs/heads/master i:   287057:
 5ddf27aefd633c303cf13c10268d6384cd8b20c5   287055:
 260929abf1a32073cd44c1a3c113a9bed687d90e v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/tty/serial/serial_core.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8dbb8b8c2055..5a0b0a83eb3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5492e6591b8fdf171236046f9d6194f9bb4062b
+refs/heads/master: 773598357c0baf03081cf87f2b444f97744faf1e
diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c
index c7bf31a6a7e7..13056180adf5 100644
--- a/trunk/drivers/tty/serial/serial_core.c
+++ b/trunk/drivers/tty/serial/serial_core.c
@@ -2348,11 +2348,11 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
 	 */
 	tty_dev = tty_register_device(drv->tty_driver, uport->line, uport->dev);
 	if (likely(!IS_ERR(tty_dev))) {
-		device_init_wakeup(tty_dev, 1);
-		device_set_wakeup_enable(tty_dev, 0);
-	} else
+		device_set_wakeup_capable(tty_dev, 1);
+	} else {
 		printk(KERN_ERR "Cannot register tty device on line %d\n",
 		       uport->line);
+	}
 
 	/*
 	 * Ensure UPF_DEAD is not set.