Commit 2e93960c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] SAM9 watchdog - supported on all SAM9 and CAP9 processors
  [WATCHDOG] SAM9 watchdog - update for moved headers
parents 71fe3fca f0e625c1

drivers/watchdog/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -67,11 +67,11 @@ config AT91RM9200_WATCHDOG 
	  system when the timeout is reached.



config AT91SAM9X_WATCHDOG

	tristate "AT91SAM9X watchdog"

	depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261)

	tristate "AT91SAM9X / AT91CAP9 watchdog"

	depends on ARCH_AT91 && !ARCH_AT91RM9200

	help

	  Watchdog timer embedded into AT91SAM9X chips. This will reboot your

	  system when the timeout is reached.

	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will

	  reboot your system when the timeout is reached.



config 21285_WATCHDOG

	tristate "DC21285 watchdog"