Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / arch / sparc / kernel / setup_64.c

diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index f2bcfd2967d76e463d183873ce309b4c71e5ca42..21180339cb09dd2a9d054296703c4c6a10bf6578 100644 (file)
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -295,8 +295,6 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_DUMMY_CONSOLE
        conswitchp = &dummy_con;
-#elif defined(CONFIG_PROM_CONSOLE)
-       conswitchp = &prom_con;
 #endif
 
        idprom_init();