diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-14 13:53:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-14 13:53:54 -0400 |
| commit | 4f9a197c223cc019801be948e444d05904391109 (patch) | |
| tree | 53212e57ecf357dd006ec7d4626024cec307aa47 | |
| parent | 3792a64fdeeb9cab56c22695aaeb0624f1b295b4 (diff) | |
| parent | 09549cd01726a7ff8b102a93e46b059531583ab6 (diff) | |
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
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9fcc70c11cea..e89fc3133972 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG | |||
| 117 | 117 | ||
| 118 | config AT91RM9200_WATCHDOG | 118 | config AT91RM9200_WATCHDOG |
| 119 | tristate "AT91RM9200 watchdog" | 119 | tristate "AT91RM9200 watchdog" |
| 120 | depends on ARCH_AT91 | 120 | depends on ARCH_AT91RM9200 |
| 121 | help | 121 | help |
| 122 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your | 122 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your |
| 123 | system when the timeout is reached. | 123 | system when the timeout is reached. |