1 files changed, 17 insertions, 8 deletions

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index f3d7fd3406a6..f660ef3e5b29 100644
--- 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"
@@ -319,6 +319,15 @@ config RTC_DRV_RS5C348
           This driver can also be built as a module. If so, the module
           will be called rtc-rs5c348.
 
+config RTC_DRV_DS3234
+        tristate "Maxim/Dallas DS3234"
+        help
+          If you say yes here you get support for the
+          Maxim/Dallas DS3234 SPI RTC chip.
+
+          This driver can also be built as a module. If so, the module
+          will be called rtc-ds3234.
+
 endif # SPI_MASTER
 
 comment "Platform RTC drivers"
@@ -603,7 +612,7 @@ config RTC_DRV_RS5C313
 
 config RTC_DRV_PPC
        tristate "PowerPC machine dependent RTC support"
-       depends on PPC_MERGE
+       depends on PPC
        help
          The PowerPC kernel has machine-specific functions for accessing
          the RTC. This exposes that functionality through the generic RTC