Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 1a9459615c3957597573262514edba5fb7b46339..814f49fde530ea3bf49210222a4e6d2f23ce8617 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -220,22 +220,22 @@ config RTC_DRV_PCF8583
          will be called rtc-pcf8583.
 
 config RTC_DRV_M41T80
-       tristate "ST M41T80/81/82/83/84/85/87"
+       tristate "ST M41T65/M41T80/81/82/83/84/85/87"
        help
-         If you say Y here you will get support for the
-         ST M41T80 RTC chips series. Currently following chips are
-         supported: M41T80, M41T81, M41T82, M41T83, M41ST84, M41ST85
-         and M41ST87.
+         If you say Y here you will get support for the ST M41T60
+         and M41T80 RTC chips series. Currently, the following chips are
+         supported: M41T65, M41T80, M41T81, M41T82, M41T83, M41ST84,
+         M41ST85, and M41ST87.
 
          This driver can also be built as a module. If so, the module
          will be called rtc-m41t80.
 
 config RTC_DRV_M41T80_WDT
-       bool "ST M41T80 series RTC watchdog timer"
+       bool "ST M41T65/M41T80 series RTC watchdog timer"
        depends on RTC_DRV_M41T80
        help
          If you say Y here you will get support for the
-         watchdog timer in ST M41T80 RTC chips series.
+         watchdog timer in the ST M41T60 and M41T80 RTC chips series.
 
 config RTC_DRV_TWL92330
        boolean "TI TWL92330/Menelaus"
@@ -610,6 +610,14 @@ config RTC_DRV_RS5C313
        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