Merge tag 'at91-clocksource-driver2' of...

Merge tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers Pull "A fix for the ST clocksource driver Kconfig option" from Nicolas Ferre * tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: clocksource: atmel-st: select MFD_SYSCON

Merge tag 'at91-clocksource-driver2' of...
Merge tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers Pull "A fix for the ST clocksource driver Kconfig option" from Nicolas Ferre * tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: clocksource: atmel-st: select MFD_SYSCON
7415d97e · Arnd Bergmann · 875dac1c · 7ab7ef74 · 7415d97e
Commit 7415d97e authored Apr 14, 2015 by Arnd Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

drivers/clocksource/Kconfig drivers/clocksource/Kconfig +1 -0

No files found.
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -146,6 +146,7 @@ config ATMEL_PIT
 config ATMEL_ST
 	bool
 	select CLKSRC_OF
+	select MFD_SYSCON

 config CLKSRC_METAG_GENERIC
 	def_bool y if METAG