aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/vt.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 13:49:45 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-07-03 13:49:45 -0400
commit026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch)
tree2624a44924c625c367f3cebf937853b9da2de282 /drivers/char/vt.c
parent9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff)
parent29454dde27d8e340bb1987bad9aa504af7081eba (diff)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r--drivers/char/vt.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 714d95ff2f1e..3ef823d7d255 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -79,7 +79,6 @@
79#include <linux/mm.h> 79#include <linux/mm.h>
80#include <linux/console.h> 80#include <linux/console.h>
81#include <linux/init.h> 81#include <linux/init.h>
82#include <linux/devfs_fs_kernel.h>
83#include <linux/vt_kern.h> 82#include <linux/vt_kern.h>
84#include <linux/selection.h> 83#include <linux/selection.h>
85#include <linux/tiocl.h> 84#include <linux/tiocl.h>
@@ -87,7 +86,6 @@
87#include <linux/consolemap.h> 86#include <linux/consolemap.h>
88#include <linux/timer.h> 87#include <linux/timer.h>
89#include <linux/interrupt.h> 88#include <linux/interrupt.h>
90#include <linux/config.h>
91#include <linux/workqueue.h> 89#include <linux/workqueue.h>
92#include <linux/bootmem.h> 90#include <linux/bootmem.h>
93#include <linux/pm.h> 91#include <linux/pm.h>
@@ -2663,7 +2661,6 @@ int __init vty_init(void)
2663 if (!console_driver) 2661 if (!console_driver)
2664 panic("Couldn't allocate console driver\n"); 2662 panic("Couldn't allocate console driver\n");
2665 console_driver->owner = THIS_MODULE; 2663 console_driver->owner = THIS_MODULE;
2666 console_driver->devfs_name = "vc/";
2667 console_driver->name = "tty"; 2664 console_driver->name = "tty";
2668 console_driver->name_base = 1; 2665 console_driver->name_base = 1;
2669 console_driver->major = TTY_MAJOR; 2666 console_driver->major = TTY_MAJOR;