Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / drivers / tty / serial / Kconfig

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index ddcc0a4c659cb6db8e85b6f090d2f4df296fa183..d2501f01cd03483b3f83a384027275abb5b5c089 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -489,7 +489,7 @@ config SERIAL_MFD_HSU
        select SERIAL_CORE
 
 config SERIAL_MFD_HSU_CONSOLE
-       boolean "Medfile HSU serial console support"
+       bool "Medfile HSU serial console support"
        depends on SERIAL_MFD_HSU=y
        select SERIAL_CORE_CONSOLE
 
@@ -1085,6 +1085,16 @@ config SERIAL_VT8500_CONSOLE
        depends on SERIAL_VT8500=y
        select SERIAL_CORE_CONSOLE
 
+config SERIAL_ETRAXFS
+       bool "ETRAX FS serial port support"
+       depends on ETRAX_ARCH_V32 && OF
+       select SERIAL_CORE
+
+config SERIAL_ETRAXFS_CONSOLE
+       bool "ETRAX FS serial console support"
+       depends on SERIAL_ETRAXFS
+       select SERIAL_CORE_CONSOLE
+
 config SERIAL_NETX
        tristate "NetX serial port support"
        depends on ARCH_NETX