Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index c0d86bb0ceefca7880dea87dd8ef3760933631b1..cbc59495b8550ddc3e3723d74cd6796745e2abe5 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -139,6 +139,17 @@ config RTC_DRV_DS1307
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1307.
 
+config RTC_DRV_DS1374
+       tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
+       depends on RTC_CLASS && I2C
+       help
+         If you say yes here you get support for Dallas Semiconductor
+         DS1374 real-time clock chips.  If an interrupt is associated
+         with the device, the alarm functionality is supported.
+
+         This driver can also be built as a module.  If so, the module
+         will be called rtc-ds1374.
+
 config RTC_DRV_DS1672
        tristate "Dallas/Maxim DS1672"
        help
@@ -229,7 +240,7 @@ config RTC_DRV_TWL92330
        depends on MENELAUS
        help
          If you say yes here you get support for the RTC on the
-         TWL92330 "Menelaus" power mangement chip, used with OMAP2
+         TWL92330 "Menelaus" power management chip, used with OMAP2
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.