summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-06 01:36:49 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 10:41:03 -0800
commit26464378c4af9f7461b9d9e359f98dbd34ab3544 (patch)
tree0b30d044efb49eac5b6899cbc62beaeaf4296596
parent7747cdb2f8302c2e1121f6d604b62a060fb04603 (diff)
proper prototype for vty_init()
Add a proper prototype for vty_init() in include/linux/vt_kern.h Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/tty_io.c4
-rw-r--r--include/linux/vt_kern.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index f36fecd3fd26..c927f42c8e4d 100644
--- a/drivers/char/tty_io.c
+++ b/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/include/linux/vt_kern.h b/include/linux/vt_kern.h
index feb5e99a1079..9448ffbdcbf6 100644
--- a/include/linux/vt_kern.h
+++ b/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