diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 12:36:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-03 12:36:56 -0700 |
| commit | 7dfb1716d717e41c07410bab52760d865caee12b (patch) | |
| tree | d5e62713d8712af8c9b356ce402a4fa9526a6cae /drivers/char/watchdog/Kconfig | |
| parent | 20c4856b1d1939647f71dce5e54fe69fde80013f (diff) | |
| parent | 4d389dcea8543161c3bb1e26f1c2ffb7e0822ff1 (diff) | |
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] clean-up watchdog documentation
[WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver
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 1cad32c62ed..53f5538c0c0 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig @@ -115,6 +115,13 @@ config IXP4XX_WATCHDOG Say N if you are unsure. +config KS8695_WATCHDOG + tristate "KS8695 watchdog" + depends on ARCH_KS8695 + help + Watchdog timer embedded into KS8695 processor. This will reboot your + system when the timeout is reached. + config S3C2410_WATCHDOG tristate "S3C2410 Watchdog" depends on ARCH_S3C2410 |