From 630ec70adbfd83b56aa71752419c9ecc0b0d7026 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 7 Aug 2012 21:47:56 +0200
Subject: [PATCH] --- yaml --- r: 325663 b: refs/heads/master c:
 5920c2c9b9a16e86eb154fbb55d6034fbaad1b2b h: refs/heads/master i:   325661:
 012aea5c3eaa8c016417305dc0d89766b1174183   325659:
 a87f2958a1519949ef0dfeac9ad0dbfb70b727f0   325655:
 867302e3b960ce42d0c3d545cad1da15d5f1cf65   325647:
 e677d88a9c993bf9975589fabdfde50abab3579e   325631:
 5c660b610b258c62739e58ceb18d238d19932b36 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/m68k/emu/nfcon.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0f716228fb2..62dccbf954df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 793be8984fb979ae8887609862842cbb1f60bfaf
+refs/heads/master: 5920c2c9b9a16e86eb154fbb55d6034fbaad1b2b
diff --git a/trunk/arch/m68k/emu/nfcon.c b/trunk/arch/m68k/emu/nfcon.c
index 8db25e806947..16d170f53bfd 100644
--- a/trunk/arch/m68k/emu/nfcon.c
+++ b/trunk/arch/m68k/emu/nfcon.c
@@ -19,6 +19,7 @@
 #include <asm/natfeat.h>
 
 static int stderr_id;
+static struct tty_port nfcon_tty_port;
 static struct tty_driver *nfcon_tty_driver;
 
 static void nfputs(const char *str, unsigned int count)
@@ -119,6 +120,8 @@ static int __init nfcon_init(void)
 {
 	int res;
 
+	tty_port_init(&nfcon_tty_port);
+
 	stderr_id = nf_get_id("NF_STDERR");
 	if (!stderr_id)
 		return -ENODEV;
@@ -135,6 +138,7 @@ static int __init nfcon_init(void)
 	nfcon_tty_driver->flags = TTY_DRIVER_REAL_RAW;
 
 	tty_set_operations(nfcon_tty_driver, &nfcon_tty_ops);
+	tty_port_link_device(&nfcon_tty_port, nfcon_tty_driver, 0);
 	res = tty_register_driver(nfcon_tty_driver);
 	if (res) {
 		pr_err("failed to register nfcon tty driver\n");