Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…
Browse files Browse the repository at this point in the history 
…chdog

* 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
  • Loading branch information
Linus Torvalds committed Nov 6, 2008
2 parents 71fe3fc + f0e625c commit 2e93960
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/watchdog/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 2e93960

Please sign in to comment.