diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-11 14:55:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-11 14:55:15 -0700 |
| commit | 1ad5daa65395740d80aa7b2ac11887791142e018 (patch) | |
| tree | 5cec6f6b97bef5c0ffc9356f859724311ab04075 | |
| parent | ebb3762e8867941d72b5dd1778e7062e53833230 (diff) | |
| parent | bd2746f09e1d8e37164f53b846f5225f3d36ee2d (diff) | |
| download | linux-1ad5daa65395740d80aa7b2ac11887791142e018.tar.bz2 | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"Just a single fix which adds a missing Kconfig dependency to avoid
unmet dependency warnings"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/atmel-st: Add 'depends on HAS_IOMEM' to fix unmet dependency
| -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 b3b4ed9b6874..d2e5382821a4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -386,6 +386,7 @@ config ATMEL_PIT config ATMEL_ST bool "Atmel ST timer support" if COMPILE_TEST + depends on HAS_IOMEM select TIMER_OF select MFD_SYSCON help |