Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[sfrench/cifs-2.6.git] / drivers / tty / Kconfig

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 95103054c0e469faf05472a6f3aa6e84e132eee1..cc2b4d9433ed2ccf85406de35f53f69a58404973 100644 (file)
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -392,6 +392,9 @@ config PPC_EARLY_DEBUG_EHV_BC_HANDLE
 config GOLDFISH_TTY
        tristate "Goldfish TTY Driver"
        depends on GOLDFISH
+       select SERIAL_CORE
+       select SERIAL_CORE_CONSOLE
+       select SERIAL_EARLYCON
        help
          Console and system TTY driver for the Goldfish virtual platform.
 
@@ -455,4 +458,9 @@ config MIPS_EJTAG_FDC_KGDB_CHAN
        help
          FDC channel number to use for KGDB.
 
+config VCC
+       tristate "Sun Virtual Console Concentrator"
+       depends on SUN_LDOMS
+       help
+         Support for Sun logical domain consoles.
 endif # TTY