]> err.no Git - linux-2.6/commitdiff
fix SERIAL_CORE_CONSOLE driver dependencies
authorAdrian Bunk <bunk@kernel.org>
Tue, 11 Sep 2007 22:24:13 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 12 Sep 2007 00:21:27 +0000 (17:21 -0700)
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: Adrian Bunk <bunk@kernel.org>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/serial/Kconfig

index 64ff6a5f6afd0d3a5fdff7be3f4e9f8079e3624d..81b52b7cca21deb314f2b2a15864172ac6cf7eb0 100644 (file)
@@ -611,7 +611,7 @@ config SERIAL_BFIN
 
 config SERIAL_BFIN_CONSOLE
        bool "Console on Blackfin serial port"
-       depends on SERIAL_BFIN
+       depends on SERIAL_BFIN=y
        select SERIAL_CORE_CONSOLE
 
 choice
@@ -832,10 +832,10 @@ config SERIAL_MUX
            4. Change the kernel command console parameter to: console=ttyB0
 
 config SERIAL_MUX_CONSOLE
-        bool "Support for console on serial MUX"
-        depends on SERIAL_MUX
+       bool "Support for console on serial MUX"
+       depends on SERIAL_MUX=y
        select SERIAL_CORE_CONSOLE
-        default y
+       default y
 
 config PDC_CONSOLE
        bool "PDC software console support"