Merge branch 'akpm' (incoming from Andrew)

[linux-2.6-microblaze.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 476d064..e6ab071 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -204,6 +204,12 @@ config RTC_DRV_DS3232
          This driver can also be built as a module.  If so, the module
          will be called rtc-ds3232.
 
+config RTC_DRV_LP8788
+       tristate "TI LP8788 RTC driver"
+       depends on MFD_LP8788
+       help
+         Say Y to enable support for the LP8788 RTC/ALARM driver.
+
 config RTC_DRV_MAX6900
        tristate "Maxim MAX6900"
        help
@@ -243,6 +249,26 @@ config RTC_DRV_MAX8998
          This driver can also be built as a module. If so, the module
          will be called rtc-max8998.
 
+config RTC_DRV_MAX8997
+       tristate "Maxim MAX8997"
+       depends on MFD_MAX8997
+       help
+         If you say yes here you will get support for the
+         RTC of Maxim MAX8997 PMIC.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-max8997.
+
+config RTC_DRV_MAX77686
+       tristate "Maxim MAX77686"
+       depends on MFD_MAX77686
+       help
+         If you say yes here you will get support for the
+         RTC of Maxim MAX77686 PMIC.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-max77686.
+
 config RTC_DRV_RS5C372
        tristate "Ricoh R2025S/D, RS5C372A/B, RV5C386, RV5C387A"
        help
@@ -380,6 +406,14 @@ config RTC_DRV_TPS65910
          This driver can also be built as a module. If so, the module
          will be called rtc-tps65910.
 
+config RTC_DRV_TPS80031
+       tristate "TI TPS80031/TPS80032 RTC driver"
+       depends on MFD_TPS80031
+       help
+         TI Power Managment IC TPS80031 supports RTC functionality
+         along with alarm. This driver supports the RTC driver for
+         the TPS80031 RTC module.
+
 config RTC_DRV_RC5T583
        tristate "RICOH 5T583 RTC driver"
        depends on MFD_RC5T583
@@ -537,6 +571,14 @@ config RTC_DRV_PCF2123
          This driver can also be built as a module. If so, the module
          will be called rtc-pcf2123.
 
+config RTC_DRV_RX4581
+       tristate "Epson RX-4581"
+       help
+         If you say yes here you will get support for the Epson RX-4581.
+
+         This driver can also be built as a module. If so the module
+         will be called rtc-rx4581.
+
 endif # SPI_MASTER
 
 comment "Platform RTC drivers"