diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:27:21 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 18:29:20 +0100 |
| commit | 5db45002576f7d60c5bf7b23e277845cd3e806be (patch) | |
| tree | 18cf276c8c0d64c5011784b814db586c0d5476cb /drivers/rtc/Kconfig | |
| parent | 7135466151f0560604c2bfc4c27ff9cc2a40f8cd (diff) | |
| parent | ba62a8593d15f3f353acdc8ab32c18dd40a275bb (diff) | |
| download | blackbird-op-linux-5db45002576f7d60c5bf7b23e277845cd3e806be.tar.gz blackbird-op-linux-5db45002576f7d60c5bf7b23e277845cd3e806be.zip | |
Merge branch 'at91/cleanup5' into next/drivers
The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/clock.h
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/rtc/Kconfig')
| -rw-r--r-- | drivers/rtc/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index eb4669cd9597..b682651b5307 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -1110,7 +1110,7 @@ config RTC_DRV_AT91RM9200 config RTC_DRV_AT91SAM9 tristate "AT91SAM9 RTT as RTC" - depends on ARCH_AT91 && !ARCH_AT91RM9200 + depends on ARCH_AT91 select MFD_SYSCON help Some AT91SAM9 SoCs provide an RTT (Real Time Timer) block which @@ -1126,7 +1126,6 @@ config RTC_DRV_AT91SAM9_RTT int range 0 1 default 0 - prompt "RTT module Number" if ARCH_AT91SAM9263 depends on RTC_DRV_AT91SAM9 help This option is only relevant for legacy board support and @@ -1138,8 +1137,7 @@ config RTC_DRV_AT91SAM9_RTT config RTC_DRV_AT91SAM9_GPBR int - range 0 3 if !ARCH_AT91SAM9263 - range 0 15 if ARCH_AT91SAM9263 + range 0 3 default 0 prompt "Backup Register Number" depends on RTC_DRV_AT91SAM9 |
