Merge tag 'renesas-boards-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / Kconfig

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 8cd0beebdc3f0464670893eec27222b5d11c8b69..4f8b9e95ef0ae057d9cfa440525960bd2c5f144f 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -830,7 +830,7 @@ config RTC_DRV_DA9063
 
 config RTC_DRV_EFI
        tristate "EFI RTC"
-       depends on EFI
+       depends on EFI && !X86
        help
          If you say yes here you will get support for the EFI
          Real Time Clock.
@@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200
 
 config RTC_DRV_AT91SAM9
        tristate "AT91SAM9x/AT91CAP9 RTT as RTC"
-       depends on ARCH_AT91 && !(ARCH_AT91RM9200 || ARCH_AT91X40)
+       depends on ARCH_AT91 && !ARCH_AT91RM9200
        help
          RTC driver for the Atmel AT91SAM9x and AT91CAP9 internal RTT
          (Real Time Timer). These timers are powered by the backup power
@@ -1320,7 +1320,7 @@ config RTC_DRV_LPC32XX
 
 config RTC_DRV_PM8XXX
        tristate "Qualcomm PMIC8XXX RTC"
-       depends on MFD_PM8XXX
+       depends on MFD_PM8XXX || MFD_SPMI_PMIC
        help
          If you say yes here you get support for the
          Qualcomm PMIC8XXX RTC.