Skip to content

Commit

Permalink
Merge git://www.linux-watchdog.org/linux-watchdog
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Linus Torvalds committed Apr 14, 2013
2 parents 3792a64 + 09549cd commit 4f9a197
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 4f9a197

Please sign in to comment.