Commit 4f9a197c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://www.linux-watchdog.org/linux-watchdog 

Pull watchdog fix from Wim Van Sebroeck:
 "It will fix compile errors for the at91rm9200_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Revert the AT91RM9200_WATCHDOG dependency
parents 3792a64f 09549cd0

drivers/watchdog/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG 


config AT91RM9200_WATCHDOG

	tristate "AT91RM9200 watchdog"

	depends on ARCH_AT91

	depends on ARCH_AT91RM9200

	help

	  Watchdog timer embedded into AT91RM9200 chips. This will reboot your

	  system when the timeout is reached.