Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1ad5daa653 - Gogs: Go Git Service GfA electronic

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

Linus Torvalds 7 years ago

parent

ebb3762e88 bd2746f09e

commit

1ad5daa653

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
drivers/clocksource/Kconfig
							 
								View File
							
				@@ -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