Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7111de76 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

fix SERIAL_CORE_CONSOLE driver dependencies 



SERIAL_BFIN=m or SERIAL_MUX=m shouldn't allow SERIAL_CORE_CONSOLE=y.

Additionally, this patch fixes whitespace instead of tabs at the
SERIAL_MUX_CONSOLE option.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c54ea95

drivers/serial/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -611,7 +611,7 @@ config SERIAL_BFIN 




config SERIAL_BFIN_CONSOLE

config SERIAL_BFIN_CONSOLE

	bool "Console on Blackfin serial port"

	bool "Console on Blackfin serial port"

	depends on SERIAL_BFIN

	depends on SERIAL_BFIN=y

	select SERIAL_CORE_CONSOLE

	select SERIAL_CORE_CONSOLE





choice

choice
@@ -833,7 +833,7 @@ config SERIAL_MUX 




config SERIAL_MUX_CONSOLE

config SERIAL_MUX_CONSOLE

	bool "Support for console on serial MUX"

	bool "Support for console on serial MUX"

        depends on SERIAL_MUX

	depends on SERIAL_MUX=y

	select SERIAL_CORE_CONSOLE

	select SERIAL_CORE_CONSOLE

	default y

	default y