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.

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)
                 panic("Couldn't register console driver\n");
         kbd_init();
         console_map_init();
-#ifdef CONFIG_PROM_CONSOLE
-        prom_con_init();
-#endif
 #ifdef CONFIG_MDA_CONSOLE
         mda_console_init();
 #endif