From: Paul Bolle <pebolle@tiscali.nl>
Date: Tue, 20 May 2014 09:55:50 +0000 (+0200)
Subject: microblaze: remove check for CONFIG_XILINX_CONSOLE
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c770db925c0695af63f67161668df1dcfbe7172;p=linux-beck.git

microblaze: remove check for CONFIG_XILINX_CONSOLE

There's been a check for CONFIG_XILINX_CONSOLE since v2.6.30. But the
Kconfig symbol XILINX_CONSOLE was never added. Remove this check.

And, since DUMMY_CONSOLE depends on VT, we can now drop the check for
CONFIG_VT.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index ef011295777f..ab5b488e1fde 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -71,13 +71,9 @@ void __init setup_arch(char **cmdline_p)
 
 	xilinx_pci_init();
 
-#ifdef CONFIG_VT
-#if defined(CONFIG_XILINX_CONSOLE)
-	conswitchp = &xil_con;
-#elif defined(CONFIG_DUMMY_CONSOLE)
+#if defined(CONFIG_DUMMY_CONSOLE)
 	conswitchp = &dummy_con;
 #endif
-#endif
 }
 
 #ifdef CONFIG_MTD_UCLINUX