Merge git://git.infradead.org/embedded-2.6

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index b7f7371..d0ac944 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -126,8 +126,8 @@ config COMPUTONE
          order to become a dial-in server. If you have a card like that, say
          Y here and read <file:Documentation/computone.txt>.
 
-         To compile this driver as modules, choose M here: the
-         modules will be called ip2 and ip2main.
+         To compile this driver as module, choose M here: the
+         module will be called ip2.
 
 config ROCKETPORT
        tristate "Comtrol RocketPort support"
@@ -308,16 +308,6 @@ config SPECIALIX
          and compile this driver as kernel loadable module which will be
          called specialix.
 
-config SPECIALIX_RTSCTS
-       bool "Specialix DTR/RTS pin is RTS"
-       depends on SPECIALIX
-       help
-         The Specialix IO8+ card can only support either RTS or DTR. If you
-         say N here, the driver will use the pin as "DTR" when the tty is in
-         software handshake mode.  If you say Y here or hardware handshake is
-         on, it will always be RTS.  Read the file
-         <file:Documentation/specialix.txt> for more information.
-
 config SX
        tristate "Specialix SX (and SI) card support"
        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
@@ -596,11 +586,14 @@ config HVC_DRIVER
          It will automatically be selected if one of the back-end console drivers
          is selected.
 
+config HVC_IRQ
+       bool
 
 config HVC_CONSOLE
        bool "pSeries Hypervisor Virtual Console support"
        depends on PPC_PSERIES
        select HVC_DRIVER
+       select HVC_IRQ
        help
          pSeries machines when partitioned support a hypervisor virtual
          console. This driver allows each pSeries partition to have a console
@@ -611,6 +604,7 @@ config HVC_ISERIES
        depends on PPC_ISERIES
        default y
        select HVC_DRIVER
+       select HVC_IRQ
        help
          iSeries machines support a hypervisor virtual console.
 
@@ -632,13 +626,18 @@ config HVC_XEN
        bool "Xen Hypervisor Console support"
        depends on XEN
        select HVC_DRIVER
+       select HVC_IRQ
        default y
        help
          Xen virtual console device driver
 
 config VIRTIO_CONSOLE
-       bool
+       tristate "Virtio console"
+       depends on VIRTIO
        select HVC_DRIVER
+       help
+         Virtio console for use with lguest and other hypervisors.
+
 
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
@@ -657,6 +656,14 @@ config HVCS
          which will also be compiled when this driver is built as a
          module.
 
+config IBM_BSR
+       tristate "IBM POWER Barrier Synchronization Register support"
+       depends on PPC_PSERIES
+       help
+         This devices exposes a hardware mechanism for fast synchronization
+         of threads across a large system which avoids bouncing a cacheline
+         between several cores on a system
+
 source "drivers/char/ipmi/Kconfig"
 
 config DS1620
@@ -757,7 +764,7 @@ config NVRAM
 if RTC_LIB=n
 
 config RTC
-       tristate "Enhanced Real Time Clock Support"
+       tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
        depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
                        && !ARM && !SUPERH && !S390 && !AVR32
        ---help---
@@ -867,13 +874,6 @@ config DS1302
 
 endif # RTC_LIB
 
-config COBALT_LCD
-       bool "Support for Cobalt LCD"
-       depends on MIPS_COBALT
-       help
-         This option enables support for the LCD display and buttons found
-         on Cobalt systems through a misc device.
-
 config DTLK
        tristate "Double Talk PC internal speech card support"
        depends on ISA
@@ -1044,9 +1044,9 @@ config HPET
          non-periodic and/or periodic.
 
 config HPET_RTC_IRQ
-       bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC
-       default n
-       depends on HPET
+       bool
+       default HPET_EMULATE_RTC
+       depends on RTC && HPET
        help
          If you say Y here, you will disable RTC_IRQ in drivers/char/rtc.c. It
          is assumed the platform called hpet_alloc with the RTC IRQ values for