Merge omap-drivers

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

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 7ff85ad628067bcb1fe576b00bf617e745d166d3..8dd3475b9c6a0d65ac86712bee48da52985aefdb 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -841,6 +841,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"
@@ -1081,5 +1086,7 @@ config DEVPORT
        depends on ISA || PCI
        default y
 
+source "drivers/s390/char/Kconfig"
+
 endmenu