Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes...

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 0754f5c..fae9464 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -373,6 +373,14 @@ config RTC_DRV_PCF8563
          This driver can also be built as a module. If so, the module
          will be called rtc-pcf8563.
 
+config RTC_DRV_PCF85063
+       tristate "nxp PCF85063"
+       help
+         If you say yes here you get support for the PCF85063 RTC chip
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-pcf85063.
+
 config RTC_DRV_PCF8583
        tristate "Philips PCF8583"
        help
@@ -760,6 +768,15 @@ config RTC_DRV_DS1742
          This driver can also be built as a module. If so, the module
          will be called rtc-ds1742.
 
+config RTC_DRV_DS2404
+       tristate "Maxim/Dallas DS2404"
+       help
+         If you say yes here you get support for the
+         Dallas DS2404 RTC chip.
+
+         This driver can also be built as a module. If so, the module
+         will be called rtc-ds2404.
+
 config RTC_DRV_DA9052
        tristate "Dialog DA9052/DA9053 RTC"
        depends on PMIC_DA9052
@@ -789,7 +806,7 @@ config RTC_DRV_DA9063
 
 config RTC_DRV_EFI
        tristate "EFI RTC"
-       depends on IA64
+       depends on EFI
        help
          If you say yes here you will get support for the EFI
          Real Time Clock.
@@ -873,15 +890,6 @@ config RTC_DRV_V3020
          This driver can also be built as a module. If so, the module
          will be called rtc-v3020.
 
-config RTC_DRV_DS2404
-       tristate "Dallas DS2404"
-       help
-         If you say yes here you get support for the
-         Dallas DS2404 RTC chip.
-
-         This driver can also be built as a module. If so, the module
-         will be called rtc-ds2404.
-
 config RTC_DRV_WM831X
        tristate "Wolfson Microelectronics WM831x RTC"
        depends on MFD_WM831X
@@ -1190,7 +1198,7 @@ config RTC_DRV_TX4939
 
 config RTC_DRV_MV
        tristate "Marvell SoC RTC"
-       depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+       depends on ARCH_DOVE || ARCH_MVEBU
        help
          If you say yes here you will get support for the in-chip RTC
          that can be found in some of Marvell's SoC devices, such as
@@ -1349,6 +1357,7 @@ config RTC_DRV_SIRFSOC
 
 config RTC_DRV_MOXART
        tristate "MOXA ART RTC"
+       depends on ARCH_MOXART || COMPILE_TEST
        help
           If you say yes here you get support for the MOXA ART
           RTC module.