Commit 1ad5daa6 authored Mar 11, 2018 by Linus Torvalds

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

parents ebb3762e bd2746f0

drivers/clocksource/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -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