Commit 7415d97e authored by Arnd Bergmann's avatar Arnd Bergmann

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
parents 875dac1c 7ab7ef74
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment