OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2008-11-06 15:50:54 -08:00
parent 71fe3fcaf6 f0e625c1aa
commit 2e93960c4d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/watchdog/Kconfig
View File

@ -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"