diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-20 11:55:50 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-06-04 07:00:00 +0200 |
| commit | 8c770db925c0695af63f67161668df1dcfbe7172 (patch) | |
| tree | 2f824cac71ab282ca70948c4673b43cdda984dc6 /arch | |
| parent | bf5db2fbd65e6225a8aa749d4e788e223518d486 (diff) | |
| download | linux-8c770db925c0695af63f67161668df1dcfbe7172.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 6 |
1 files changed, 1 insertions, 5 deletions
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 |