Merge with ../linux-2.6

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c29365d..7256318 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -659,6 +659,18 @@ config HW_RANDOM
 
          If unsure, say N.
 
+config OMAP16XX_RNG
+       tristate "OMAP16xx Random Number Generator support"
+       depends on ARCH_OMAP16XX
+       ---help---
+         This driver provides kernel-side support for the Random Number
+         Generator hardware found on OMAP16xx multimedia processors.
+
+         To compile this driver as a module, choose M here: the
+         module will be called hw_random.
+
+         If unsure, say N.
+
 config NVRAM
        tristate "/dev/nvram support"
        depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
@@ -761,6 +773,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_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730
+       help
+         Support for TI OMAP RTC
 
 config DS1302
        tristate "DS1302 RTC support"