diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-04-13 19:52:47 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-04-13 19:52:47 -0400 |
| commit | 7415d97ee2b809119270fc3a365968ff8d4f544b (patch) | |
| tree | 36f4dd58c32557375c93f2298342056e2b0dfb2d | |
| parent | 875dac1c72e4ced725c37685086d52259ccb90dc (diff) | |
| parent | 7ab7ef741a467e7af50c9b7446ec992bec9ea6a7 (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/Kconfig | 1 |
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 | |||
| 146 | config ATMEL_ST | 146 | config ATMEL_ST |
| 147 | bool | 147 | bool |
| 148 | select CLKSRC_OF | 148 | select CLKSRC_OF |
| 149 | select MFD_SYSCON | ||
| 149 | 150 | ||
| 150 | config CLKSRC_METAG_GENERIC | 151 | config CLKSRC_METAG_GENERIC |
| 151 | def_bool y if METAG | 152 | def_bool y if METAG |