From 1f2e203dac45d42e006ef0cb138087e28e365dd3 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 9 Nov 2011 21:33:50 +0100
Subject: [PATCH] --- yaml --- r: 280675 b: refs/heads/master c:
 0b1db83081599615cf7b254aebc14a2d8f6ca056 h: refs/heads/master i:   280673:
 f06360e1cf57ac0920dc0442684559b48795beb3   280671:
 faa1e5b5231f39667de693de8ff9257b88ff9692 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/tty/serial/serial_core.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 032f8e28d7df..ea332963c4e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c7b13c4886f5cfaf02fb1052f65ef1a2fe88b9a
+refs/heads/master: 0b1db83081599615cf7b254aebc14a2d8f6ca056
diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c
index 2ca4df4a4836..d7e8a5ef1879 100644
--- a/trunk/drivers/tty/serial/serial_core.c
+++ b/trunk/drivers/tty/serial/serial_core.c
@@ -1404,6 +1404,15 @@ static void uart_hangup(struct tty_struct *tty)
 	mutex_unlock(&port->mutex);
 }
 
+static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)
+{
+	return 0;
+}
+
+static void uart_port_shutdown(struct tty_port *port)
+{
+}
+
 static int uart_carrier_raised(struct tty_port *port)
 {
 	struct uart_state *state = container_of(port, struct uart_state, port);
@@ -2162,6 +2171,8 @@ static const struct tty_operations uart_ops = {
 };
 
 static const struct tty_port_operations uart_port_ops = {
+	.activate	= uart_port_activate,
+	.shutdown	= uart_port_shutdown,
 	.carrier_raised = uart_carrier_raised,
 	.dtr_rts	= uart_dtr_rts,
 };