Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118500
b: refs/heads/master
c: f0e625c
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Victor authored and Wim Van Sebroeck committed Nov 6, 2008
1 parent 9e7c55b commit bc31db3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b954f6f63e7938a11de5bd15cb5cbcac7423cf97
refs/heads/master: f0e625c1aa24e861c224fb778c377b2ddb443d2b
8 changes: 4 additions & 4 deletions trunk/drivers/watchdog/Kconfig
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 bc31db3

Please sign in to comment.