diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-09-11 18:24:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-11 20:21:27 -0400 |
commit | 7111de76438e05ceab8ba2a471192fa3ea6c3572 (patch) | |
tree | 38977ee9855eb798f02a36acbe176f5c67a2e7ca /drivers/serial | |
parent | 9c54ea95852a920720868d0e18bb4e9d645ea007 (diff) |
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: 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>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 64ff6a5f6afd..81b52b7cca21 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -611,7 +611,7 @@ config SERIAL_BFIN | |||
611 | 611 | ||
612 | config SERIAL_BFIN_CONSOLE | 612 | config SERIAL_BFIN_CONSOLE |
613 | bool "Console on Blackfin serial port" | 613 | bool "Console on Blackfin serial port" |
614 | depends on SERIAL_BFIN | 614 | depends on SERIAL_BFIN=y |
615 | select SERIAL_CORE_CONSOLE | 615 | select SERIAL_CORE_CONSOLE |
616 | 616 | ||
617 | choice | 617 | choice |
@@ -832,10 +832,10 @@ config SERIAL_MUX | |||
832 | 4. Change the kernel command console parameter to: console=ttyB0 | 832 | 4. Change the kernel command console parameter to: console=ttyB0 |
833 | 833 | ||
834 | config SERIAL_MUX_CONSOLE | 834 | config SERIAL_MUX_CONSOLE |
835 | bool "Support for console on serial MUX" | 835 | bool "Support for console on serial MUX" |
836 | depends on SERIAL_MUX | 836 | depends on SERIAL_MUX=y |
837 | select SERIAL_CORE_CONSOLE | 837 | select SERIAL_CORE_CONSOLE |
838 | default y | 838 | default y |
839 | 839 | ||
840 | config PDC_CONSOLE | 840 | config PDC_CONSOLE |
841 | bool "PDC software console support" | 841 | bool "PDC software console support" |