From 901359372a2acfda96a6b641c30f52eaf21ece66 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Wed, 6 Feb 2008 01:36:49 -0800
Subject: [PATCH] --- yaml --- r: 83408 b: refs/heads/master c:
 26464378c4af9f7461b9d9e359f98dbd34ab3544 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/tty_io.c   | 4 ----
 trunk/include/linux/vt_kern.h | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0304295ec565..a91be50f894f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7747cdb2f8302c2e1121f6d604b62a060fb04603
+refs/heads/master: 26464378c4af9f7461b9d9e359f98dbd34ab3544
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index f36fecd3fd26..c927f42c8e4d 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -4048,10 +4048,6 @@ void __init console_init(void)
 	}
 }
 
-#ifdef CONFIG_VT
-extern int vty_init(void);
-#endif
-
 static int __init tty_class_init(void)
 {
 	tty_class = class_create(THIS_MODULE, "tty");
diff --git a/trunk/include/linux/vt_kern.h b/trunk/include/linux/vt_kern.h
index feb5e99a1079..9448ffbdcbf6 100644
--- a/trunk/include/linux/vt_kern.h
+++ b/trunk/include/linux/vt_kern.h
@@ -77,6 +77,7 @@ void change_console(struct vc_data *new_vc);
 void reset_vc(struct vc_data *vc);
 extern int unbind_con_driver(const struct consw *csw, int first, int last,
 			     int deflt);
+int vty_init(void);
 
 /*
  * vc_screen.c shares this temporary buffer with the console write code so that