diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-20 05:55:50 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-06-04 01:00:00 -0400 |
commit | 8c770db925c0695af63f67161668df1dcfbe7172 (patch) | |
tree | 2f824cac71ab282ca70948c4673b43cdda984dc6 /arch/microblaze/kernel | |
parent | bf5db2fbd65e6225a8aa749d4e788e223518d486 (diff) |
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/microblaze/kernel')
-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) | |||
71 | 71 | ||
72 | xilinx_pci_init(); | 72 | xilinx_pci_init(); |
73 | 73 | ||
74 | #ifdef CONFIG_VT | 74 | #if defined(CONFIG_DUMMY_CONSOLE) |
75 | #if defined(CONFIG_XILINX_CONSOLE) | ||
76 | conswitchp = &xil_con; | ||
77 | #elif defined(CONFIG_DUMMY_CONSOLE) | ||
78 | conswitchp = &dummy_con; | 75 | conswitchp = &dummy_con; |
79 | #endif | 76 | #endif |
80 | #endif | ||
81 | } | 77 | } |
82 | 78 | ||
83 | #ifdef CONFIG_MTD_UCLINUX | 79 | #ifdef CONFIG_MTD_UCLINUX |