A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'at91/cleanup5' into next/drivers

Browse source 
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 <[email protected]>
This commit is contained in:
Arnd Bergmann 2014-12-08 18:27:21 +01:00
commit 5db4500257
82 changed files with 34 additions and 18437 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/rtc/Kconfig
View file

@ -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