From 8c770db925c0695af63f67161668df1dcfbe7172 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 20 May 2014 11:55:50 +0200 Subject: 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 Signed-off-by: Michal Simek --- arch/microblaze/kernel/setup.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'arch/microblaze') 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 -- cgit v1.2.3