From a34b7f9b474e7a27683005a21feb633523603877 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 4 Jun 2012 13:35:32 +0200
Subject: [PATCH] --- yaml --- r: 325588 b: refs/heads/master c:
 695586ca20c56cf8cfa87160383307a288d32496 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/tty/tty_port.c | 8 ++++++++
 trunk/include/linux/tty.h    | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a3d8de2eed70..796a2070f46c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c2ef53d3bfb36659c47ba589f35bcab24f425c7
+refs/heads/master: 695586ca20c56cf8cfa87160383307a288d32496
diff --git a/trunk/drivers/tty/tty_port.c b/trunk/drivers/tty/tty_port.c
index bf6e238146ae..1ac8abf4708d 100644
--- a/trunk/drivers/tty/tty_port.c
+++ b/trunk/drivers/tty/tty_port.c
@@ -413,6 +413,14 @@ void tty_port_close(struct tty_port *port, struct tty_struct *tty,
 }
 EXPORT_SYMBOL(tty_port_close);
 
+int tty_port_install(struct tty_port *port, struct tty_driver *driver,
+		struct tty_struct *tty)
+{
+	tty->port = port;
+	return tty_standard_install(driver, tty);
+}
+EXPORT_SYMBOL_GPL(tty_port_install);
+
 int tty_port_open(struct tty_port *port, struct tty_struct *tty,
 							struct file *filp)
 {
diff --git a/trunk/include/linux/tty.h b/trunk/include/linux/tty.h
index 9f47ab540f65..45ef71df0e72 100644
--- a/trunk/include/linux/tty.h
+++ b/trunk/include/linux/tty.h
@@ -521,6 +521,8 @@ extern int tty_port_close_start(struct tty_port *port,
 extern void tty_port_close_end(struct tty_port *port, struct tty_struct *tty);
 extern void tty_port_close(struct tty_port *port,
 				struct tty_struct *tty, struct file *filp);
+extern int tty_port_install(struct tty_port *port, struct tty_driver *driver,
+				struct tty_struct *tty);
 extern int tty_port_open(struct tty_port *port,
 				struct tty_struct *tty, struct file *filp);
 static inline int tty_port_users(struct tty_port *port)