On 05/20/2014 11:55 AM, Paul Bolle wrote: > 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 <pebo...@tiscali.nl> > --- > Untested. > > Note that xil_con doesn't exit either. > > arch/microblaze/kernel/setup.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c > index bd422794a651..3a93843d346c 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
Looks reasonable. Applied. Thanks, Michal -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
signature.asc
Description: OpenPGP digital signature
