diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /drivers/char/watchdog/Kconfig | |
| parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/char/watchdog/Kconfig')
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index 16e99db2e12d..d53f664a4dd8 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig | |||
| @@ -60,6 +60,13 @@ config SOFT_WATCHDOG | |||
| 60 | 60 | ||
| 61 | # ARM Architecture | 61 | # ARM Architecture |
| 62 | 62 | ||
| 63 | config AT91_WATCHDOG | ||
| 64 | tristate "AT91RM9200 watchdog" | ||
| 65 | depends on WATCHDOG && ARCH_AT91RM9200 | ||
| 66 | help | ||
| 67 | Watchdog timer embedded into AT91RM9200 chips. This will reboot your | ||
| 68 | system when the timeout is reached. | ||
| 69 | |||
| 63 | config 21285_WATCHDOG | 70 | config 21285_WATCHDOG |
| 64 | tristate "DC21285 watchdog" | 71 | tristate "DC21285 watchdog" |
| 65 | depends on WATCHDOG && FOOTBRIDGE | 72 | depends on WATCHDOG && FOOTBRIDGE |