summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/mem.c6
-rw-r--r--drivers/char/tty_io.c3
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 9c7faf625..3b5a2c497 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -49,9 +49,6 @@ extern void fbmem_init(void);
#ifdef CONFIG_PROM_CONSOLE
extern void prom_con_init(void);
#endif
-#ifdef CONFIG_SGI_PROM_CONSOLE
-extern void sgi_prom_console_init(void);
-#endif
#ifdef CONFIG_MDA_CONSOLE
extern void mda_console_init(void);
#endif
@@ -636,9 +633,6 @@ int __init chr_dev_init(void)
#if defined (CONFIG_PROM_CONSOLE)
prom_con_init();
#endif
-#if defined (CONFIG_SGI_PROM_CONSOLE)
- sgi_prom_console_init();
-#endif
#if defined (CONFIG_MDA_CONSOLE)
mda_console_init();
#endif
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 4e8d4db73..0d6e6f3fa 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2198,6 +2198,9 @@ void __init console_init(void)
#ifdef CONFIG_SERIAL_SA1100_CONSOLE
sa1100_rs_console_init();
#endif
+#ifdef CONFIG_ARC_CONSOLE
+ arc_console_init();
+#endif
}
static struct tty_driver dev_tty_driver, dev_syscons_driver;