Merge branch 'akpm-current/current'

[karo-tx-linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 609b069a278c9d0f74886d8c06c8b63f2f91ebc2..db933decc39ce39ec26d9df0da4212d61fe3635d 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -315,6 +315,17 @@ config RTC_DRV_ISL12022
          This driver can also be built as a module. If so, the module
          will be called rtc-isl12022.
 
+config RTC_DRV_ISL12057
+       depends on I2C
+       select REGMAP_I2C
+       tristate "Intersil ISL12057"
+       help
+         If you say yes here you get support for the Intersil ISL12057
+         I2C RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-isl12057.
+
 config RTC_DRV_X1205
        tristate "Xicor/Intersil X1205"
        help
@@ -1115,6 +1126,13 @@ config RTC_DRV_SUN4V
          If you say Y here you will get support for the Hypervisor
          based RTC on SUN4V systems.
 
+config RTC_DRV_SUNXI
+       tristate "Allwinner sun4i/sun7i RTC"
+       depends on ARCH_SUNXI
+       help
+         If you say Y here you will get support for the RTC found on
+         Allwinner A10/A20.
+
 config RTC_DRV_STARFIRE
        bool "Starfire RTC"
        depends on SPARC64