commit 4f9a197c223cc019801be948e444d05904391109
author Linus Torvalds <torvalds@linux-foundation.org> Sun Apr 14 10:53:54 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Apr 14 10:53:54 2013 -0700
tree 53212e57ecf357dd006ec7d4626024cec307aa47
parent 3792a64fdeeb9cab56c22695aaeb0624f1b295b4
parent 09549cd01726a7ff8b102a93e46b059531583ab6

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

drivers/watchdog/Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9fcc70c..e89fc31 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -117,7 +117,7 @@
 
 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.