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 35677f75a1d8ddf3dcbd336ce43ecf4ea3454e0d..d2501f01cd03483b3f83a384027275abb5b5c089 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -241,6 +241,7 @@ config SERIAL_SAMSUNG
        tristate "Samsung SoC serial support"
        depends on PLAT_SAMSUNG || ARCH_EXYNOS
        select SERIAL_CORE
+       select SERIAL_EARLYCON
        help
          Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
          providing /dev/ttySAC0, 1 and 2 (note, some machines may not
@@ -488,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
 
@@ -1084,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
@@ -1582,6 +1593,24 @@ config SERIAL_MEN_Z135
          This driver can also be build as a module. If so, the module will be called
          men_z135_uart.ko
 
+config SERIAL_SPRD
+       tristate "Support for Spreadtrum serial"
+       depends on ARCH_SPRD
+       select SERIAL_CORE
+       help
+         This enables the driver for the Spreadtrum's serial.
+
+config SERIAL_SPRD_CONSOLE
+       bool "Spreadtrum UART console support"
+       depends on SERIAL_SPRD=y
+       select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
+       help
+         Support for early debug console using Spreadtrum's serial. This enables
+         the console before standard serial driver is probed. This is enabled
+         with "earlycon" on the kernel command line. The console is
+         enabled when early_param is processed.
+
 endmenu
 
 config SERIAL_MCTRL_GPIO