diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 02:50:54 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-07 02:50:54 +0300 |
| commit | 2e93960c4d712096902c16fe5511fc91502c2527 (patch) | |
| tree | bcd3b72be70e8a5da5518e8212a54377ea39f874 | |
| parent | 71fe3fcaf67cec856650e12979b282428ed806a3 (diff) | |
| parent | f0e625c1aa24e861c224fb778c377b2ddb443d2b (diff) | |
| download | linux-2e93960c4d712096902c16fe5511fc91502c2527.tar.xz | |
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
| -rw-r--r-- | drivers/watchdog/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 1a22fe782a27..4fd3fa5546b1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -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" |