Merge omap-drivers

[linux-2.6-omap-h63xx.git] / drivers / char / Kconfig

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9e43e39dc35c09dc25efafa0c56555bfeabf4dea..948b06494d78ea39a027f132710ee5b562212b53 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -191,7 +191,7 @@ config MOXA_INTELLIO
          module will be called moxa.
 
 config MOXA_SMARTIO
-       tristate "Moxa SmartIO support"
+       tristate "Moxa SmartIO support (OBSOLETE)"
        depends on SERIAL_NONSTANDARD
        help
          Say Y here if you have a Moxa SmartIO multiport serial card.
@@ -202,7 +202,7 @@ config MOXA_SMARTIO
          here.
 
 config MOXA_SMARTIO_NEW
-       tristate "Moxa SmartIO support v. 2.0 (EXPERIMENTAL)"
+       tristate "Moxa SmartIO support v. 2.0"
        depends on SERIAL_NONSTANDARD && (PCI || EISA || ISA)
        help
          Say Y here if you have a Moxa SmartIO multiport serial card and/or
@@ -610,6 +610,13 @@ config HVC_RTAS
        help
          IBM Console device driver which makes use of RTAS
 
+config HVC_BEAT
+       bool "Toshiba's Beat Hypervisor Console support"
+       depends on PPC_CELLEB
+       select HVC_DRIVER
+       help
+         Toshiba's Cell Reference Set Beat Console device driver
+
 config HVCS
        tristate "IBM Hypervisor Virtual Console Server support"
        depends on PPC_PSERIES
@@ -696,6 +703,16 @@ config NWFLASH
 
 source "drivers/char/hw_random/Kconfig"
 
+config OMAP_RNG
+       tristate "OMAP Random Number Generator support"
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on OMAP16xx and OMAP24xx multimedia
+         processors.
+
+         If unsure, say N.
+
 config NVRAM
        tristate "/dev/nvram support"
        depends on ATARI || X86 || ARM || GENERIC_NVRAM
@@ -798,6 +815,11 @@ config GEN_RTC_X
 config EFI_RTC
        bool "EFI Real Time Clock Services"
        depends on IA64
+config OMAP_RTC
+       bool "TI OMAP Real Time Clock"
+       depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730
+       help
+         Support for TI OMAP RTC
 
 config DS1302
        tristate "DS1302 RTC support"
@@ -1019,16 +1041,17 @@ config MMTIMER
 source "drivers/char/tpm/Kconfig"
 
 config TELCLOCK
-       tristate "Telecom clock driver for MPBL0010 ATCA SBC"
+       tristate "Telecom clock driver for ATCA SBC"
        depends on EXPERIMENTAL && X86
        default n
        help
-         The telecom clock device is specific to the MPBL0010 ATCA computer and
-         allows direct userspace access to the configuration of the telecom clock
-         configuration settings.  This device is used for hardware synchronization
-         across the ATCA backplane fabric.  Upon loading, the driver exports a
-         sysfs directory, /sys/devices/platform/telco_clock, with a number of
-         files for controlling the behavior of this hardware.
+         The telecom clock device is specific to the MPCBL0010 and MPCBL0050
+         ATCA computers and allows direct userspace access to the
+         configuration of the telecom clock configuration settings.  This
+         device is used for hardware synchronization across the ATCA backplane
+         fabric.  Upon loading, the driver exports a sysfs directory,
+         /sys/devices/platform/telco_clock, with a number of files for
+         controlling the behavior of this hardware.
 
 endmenu