diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:54:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 23:54:12 -0400 |
| commit | bbe5a96f678efcad83de8f900ab4ab963a99c805 (patch) | |
| tree | d1e03c52bc7d16c1ac9f41503b27da2f4b6b781d /drivers/char/vt.c | |
| parent | f205ce83a766c08965ec78342f138cdc00631fba (diff) | |
| parent | 0a375d75902c522ea36c6dc409296622f93db4a7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Update defconfigs.
sparc: Kill PROM console driver.
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 404f4c1ee431..6aa88f50b039 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -2948,9 +2948,6 @@ int __init vty_init(const struct file_operations *console_fops) | |||
| 2948 | panic("Couldn't register console driver\n"); | 2948 | panic("Couldn't register console driver\n"); |
| 2949 | kbd_init(); | 2949 | kbd_init(); |
| 2950 | console_map_init(); | 2950 | console_map_init(); |
| 2951 | #ifdef CONFIG_PROM_CONSOLE | ||
| 2952 | prom_con_init(); | ||
| 2953 | #endif | ||
| 2954 | #ifdef CONFIG_MDA_CONSOLE | 2951 | #ifdef CONFIG_MDA_CONSOLE |
| 2955 | mda_console_init(); | 2952 | mda_console_init(); |
| 2956 | #endif | 2953 | #endif |