summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-04-14 01:52:47 +0200
committerArnd Bergmann <arnd@arndb.de>2015-04-14 01:52:47 +0200
commit7415d97ee2b809119270fc3a365968ff8d4f544b (patch)
tree36f4dd58c32557375c93f2298342056e2b0dfb2d
parent875dac1c72e4ced725c37685086d52259ccb90dc (diff)
parent7ab7ef741a467e7af50c9b7446ec992bec9ea6a7 (diff)
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
-rw-r--r--drivers/clocksource/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 168035883afa..55aef6f89074 100644
--- 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