Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[mv-sheeva.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 9238c8f40f0388f9511dafd2d8bb2b4984324a6b..48ca7132cc05da18a16c9136f3974219bce4a3d3 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -166,6 +166,16 @@ config RTC_DRV_DS1672
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1672.
 
+config RTC_DRV_DS3232
+       tristate "Dallas/Maxim DS3232"
+       depends on RTC_CLASS && I2C
+       help
+         If you say yes here you get support for Dallas Semiconductor
+         DS3232 real-time clock chips.
+
+         This driver can also be built as a module.  If so, the module
+         will be called rtc-ds3232.
+
 config RTC_DRV_MAX6900
        tristate "Maxim MAX6900"
        help
@@ -203,6 +213,15 @@ config RTC_DRV_ISL1208
          This driver can also be built as a module. If so, the module
          will be called rtc-isl1208.
 
+config RTC_DRV_ISL12022
+       tristate "Intersil ISL12022"
+       help
+         If you say yes here you get support for the
+         Intersil ISL12022 RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-isl12022.
+
 config RTC_DRV_X1205
        tristate "Xicor/Intersil X1205"
        help
@@ -537,6 +556,16 @@ config RTC_DRV_MSM6242
          This driver can also be built as a module. If so, the module
          will be called rtc-msm6242.
 
+config RTC_DRV_IMXDI
+       tristate "Freescale IMX DryIce Real Time Clock"
+       depends on ARCH_MX25
+       depends on RTC_CLASS
+       help
+          Support for Freescale IMX DryIce RTC
+
+          This driver can also be built as a module, if so, the module
+          will be called "rtc-imxdi".
+
 config RTC_MXC
        tristate "Freescale MXC Real Time Clock"
        depends on ARCH_MXC