Merge git://github.com/rustyrussell/linux

[pandora-kernel.git] / drivers / tty / Kconfig

diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index f462fa5..b3d1741 100644 (file)
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -1,6 +1,6 @@
 config VT
        bool "Virtual terminal" if EXPERT
-       depends on !S390
+       depends on !S390 && !UML
        select INPUT
        default y
        ---help---
@@ -60,6 +60,10 @@ config VT_CONSOLE
 
          If unsure, say Y.
 
+config VT_CONSOLE_SLEEP
+       def_bool y
+       depends on VT_CONSOLE && PM_SLEEP
+
 config HW_CONSOLE
        bool
        depends on VT && !UML
@@ -350,3 +354,37 @@ config TRACE_SINK
 
          If you select this option, you need to select
          "Trace data router for MIPI P1149.7 cJTAG standard".
+
+config PPC_EPAPR_HV_BYTECHAN
+       tristate "ePAPR hypervisor byte channel driver"
+       depends on PPC
+       help
+         This driver creates /dev entries for each ePAPR hypervisor byte
+         channel, thereby allowing applications to communicate with byte
+         channels as if they were serial ports.
+
+config PPC_EARLY_DEBUG_EHV_BC
+       bool "Early console (udbg) support for ePAPR hypervisors"
+       depends on PPC_EPAPR_HV_BYTECHAN
+       help
+         Select this option to enable early console (a.k.a. "udbg") support
+         via an ePAPR byte channel.  You also need to choose the byte channel
+         handle below.
+
+config PPC_EARLY_DEBUG_EHV_BC_HANDLE
+       int "Byte channel handle for early console (udbg)"
+       depends on PPC_EARLY_DEBUG_EHV_BC
+       default 0
+       help
+         If you want early console (udbg) output through a byte channel,
+         specify the handle of the byte channel to use.
+
+         For this to work, the byte channel driver must be compiled
+         in-kernel, not as a module.
+
+         Note that only one early console driver can be enabled, so don't
+         enable any others if you enable this one.
+
+         If the number you specify is not a valid byte channel handle, then
+         there simply will be no early console output.  This is true also
+         if you don't boot under a hypervisor at all.