Skip to content

L
linux-davinci
Commit 2e93960c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
parents 71fe3fca f0e625c1
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
drivers/watchdog/Kconfig
View file @ 2e93960c
...@@ -67,11 +67,11 @@ config AT91RM9200_WATCHDOG ...@@ -67,11 +67,11 @@ config AT91RM9200_WATCHDOG
system when the timeout is reached. system when the timeout is reached.
config AT91SAM9X_WATCHDOG config AT91SAM9X_WATCHDOG
tristate "AT91SAM9X watchdog" tristate "AT91SAM9X / AT91CAP9 watchdog"
depends on WATCHDOG && (ARCH_AT91SAM9260 || ARCH_AT91SAM9261) depends on ARCH_AT91 && !ARCH_AT91RM9200
help help
Watchdog timer embedded into AT91SAM9X chips. This will reboot your Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
system when the timeout is reached. reboot your system when the timeout is reached.
config 21285_WATCHDOG config 21285_WATCHDOG
tristate "DC21285 watchdog" tristate "DC21285 watchdog"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment