Pull osi into release branch

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 35f34665e3c44f06e01c103226462023cdaa5aab..9d8d40d5c8f77f1c8f969805de31f640bac12c31 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -38,6 +38,9 @@ config RTC_HCTOSYS_DEVICE
          clock, usually rtc0.  Initialization is done when the system
          starts up, and when it resumes from a low power state.
 
+         The driver for this RTC device must be loaded before late_initcall
+         functions run, so it must usually be statically linked.
+
          This clock should be battery-backed, so that it reads the correct
          time when the system boots from a power-off state.  Otherwise, your
          system will need an external clock source (like an NTP server).
@@ -305,6 +308,16 @@ config RTC_DRV_DS1553
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1553.
 
+config RTC_DRV_STK17TA8
+       tristate "Simtek STK17TA8"
+       depends on RTC_CLASS
+       help
+         If you say yes here you get support for the
+         Simtek STK17TA8 timekeeping chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-stk17ta8.
+
 config RTC_DRV_DS1742
        tristate "Dallas DS1742/1743"
        depends on RTC_CLASS