Skip to content
This repository has been archived by the owner on Aug 27, 2022. It is now read-only.

Commit

Permalink
microblaze: remove check for CONFIG_XILINX_CONSOLE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
pebolle authored and Michal Simek committed Jun 4, 2014
1 parent bf5db2f commit 8c770db
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions arch/microblaze/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8c770db

Please sign in to comment.