Merge ../linux-2.6

[safe/jmp/linux-2.6] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 73d30bf..889cad0 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -561,14 +561,31 @@ config TIPAR
 
          If unsure, say N.
 
+config HVC_DRIVER
+       bool
+       help
+         Users of pSeries machines that want to utilize the hvc console front-end
+         module for their backend console driver should select this option.
+         It will automatically be selected if one of the back-end console drivers
+         is selected.
+
+
 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES
+       select HVC_DRIVER
        help
          pSeries machines when partitioned support a hypervisor virtual
          console. This driver allows each pSeries partition to have a console
          which is accessed via the HMC.
 
+config HVC_RTAS
+       bool "IBM RTAS Console support"
+       depends on PPC_RTAS
+       select HVC_DRIVER
+       help
+         IBM Console device driver which makes use of RTAS
+
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES