Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index f660ef3e5b29e801f205eb06358cf54f26490e25..8abbb2020af9c0d6b238d16cf81c4277de31dc3d 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -171,10 +171,10 @@ config RTC_DRV_MAX6900
          will be called rtc-max6900.
 
 config RTC_DRV_RS5C372
          will be called rtc-max6900.
 
 config RTC_DRV_RS5C372

-       tristate "Ricoh RS5C372A/B, RV5C386, RV5C387A"
+       tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"

        help
          If you say yes here you get support for the
        help
          If you say yes here you get support for the

-         Ricoh RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips.
+         Ricoh R2025S/D, RS5C372A, RS5C372B, RV5C386, and RV5C387A RTC chips.

 
          This driver can also be built as a module. If so, the module
          will be called rtc-rs5c372.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-rs5c372.


@@ -246,6 +246,16 @@ config RTC_DRV_TWL92330
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
 
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
 

+config RTC_DRV_TWL4030
+       tristate "TI TWL4030/TWL5030/TPS659x0"
+       depends on RTC_CLASS && TWL4030_CORE
+       help
+         If you say yes here you get support for the RTC on the
+         TWL4030 family chips, used mostly with OMAP3 platforms.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-twl4030.
+

 config RTC_DRV_S35390A
        tristate "Seiko Instruments S-35390A"
        select BITREVERSE
 config RTC_DRV_S35390A
        tristate "Seiko Instruments S-35390A"
        select BITREVERSE


@@ -610,6 +620,14 @@ config RTC_DRV_RS5C313
        help
          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 
        help
          If you say yes here you get support for the Ricoh RS5C313 RTC chips.
 

+config RTC_DRV_PARISC
+       tristate "PA-RISC firmware RTC support"
+       depends on PARISC
+       help
+         Say Y or M here to enable RTC support on PA-RISC systems using
+         firmware calls. If you do not know what you are doing, you should
+         just say Y.
+

 config RTC_DRV_PPC
        tristate "PowerPC machine dependent RTC support"
        depends on PPC
 config RTC_DRV_PPC
        tristate "PowerPC machine dependent RTC support"
        depends on PPC