Merge git://git.infradead.org/intel-iommu

[cascardo/linux.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 3e84315..18639e0 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -573,24 +573,6 @@ config RTC_DRV_EM3027
          This driver can also be built as a module. If so, the module
          will be called rtc-em3027.
 
-config RTC_DRV_RV3029C2
-       tristate "Micro Crystal RV3029"
-       help
-         If you say yes here you get support for the Micro Crystal
-         RV3029 RTC chips.
-
-         This driver can also be built as a module. If so, the module
-         will be called rtc-rv3029c2.
-
-config RTC_DRV_RV3029_HWMON
-       bool "HWMON support for RV3029"
-       depends on RTC_DRV_RV3029C2 && HWMON
-       depends on !(RTC_DRV_RV3029C2=y && HWMON=m)
-       default y
-       help
-         Say Y here if you want to expose temperature sensor data on
-         rtc-rv3029.
-
 config RTC_DRV_RV8803
        tristate "Micro Crystal RV8803"
        help
@@ -634,6 +616,15 @@ config RTC_DRV_M41T94
          This driver can also be built as a module. If so, the module
          will be called rtc-m41t94.
 
+config RTC_DRV_DS1302
+       tristate "Dallas/Maxim DS1302"
+       depends on SPI
+       help
+         If you say yes here you get support for the Dallas DS1302 RTC chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-ds1302.
+
 config RTC_DRV_DS1305
        tristate "Dallas/Maxim DS1305/DS1306"
        help
@@ -777,6 +768,25 @@ config RTC_DRV_PCF2127
          This driver can also be built as a module. If so, the module
          will be called rtc-pcf2127.
 
+config RTC_DRV_RV3029C2
+       tristate "Micro Crystal RV3029/3049"
+       depends on RTC_I2C_AND_SPI
+       help
+         If you say yes here you get support for the Micro Crystal
+         RV3029 and RV3049 RTC chips.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-rv3029c2.
+
+config RTC_DRV_RV3029_HWMON
+       bool "HWMON support for RV3029/3049"
+       depends on RTC_DRV_RV3029C2 && HWMON
+       depends on !(RTC_DRV_RV3029C2=y && HWMON=m)
+       default y
+       help
+         Say Y here if you want to expose temperature sensor data on
+         rtc-rv3029.
+
 comment "Platform RTC drivers"
 
 # this 'CMOS' RTC driver is arch dependent because <asm-generic/rtc.h>
@@ -834,12 +844,6 @@ config RTC_DRV_DS1286
        help
          If you say yes here you get support for the Dallas DS1286 RTC chips.
 
-config RTC_DRV_DS1302
-       tristate "Dallas DS1302"
-       depends on SH_SECUREEDGE5410
-       help
-         If you say yes here you get support for the Dallas DS1302 RTC chips.
-
 config RTC_DRV_DS1511
        tristate "Dallas DS1511"
        depends on HAS_IOMEM