summaryrefslogtreecommitdiffstats
path: root/drivers/char/watchdog/Kconfig
diff options
context:
space:
mode:
authorKumar Gala2006-01-14 22:20:50 +0100
committerLinus Torvalds2006-01-15 03:27:07 +0100
commitfabbfb9e8c53416eaa4f62b957430211376c9c82 (patch)
treea17bd86d02975f724471dbc8ed23f4b38005b739 /drivers/char/watchdog/Kconfig
parent[PATCH] Add tmpfs options for memory placement policies (diff)
downloadkernel-qcow2-linux-fabbfb9e8c53416eaa4f62b957430211376c9c82.tar.gz
kernel-qcow2-linux-fabbfb9e8c53416eaa4f62b957430211376c9c82.tar.xz
kernel-qcow2-linux-fabbfb9e8c53416eaa4f62b957430211376c9c82.zip
[PATCH] powerpc: Add support for the MPC83xx watchdog
Add support for the PowerPC MPC83xx watchdog. The MPC83xx has a simple watchdog that once enabled it can not be stopped, has some simple timeout range selection, and the ability to either reset the processor or take a machine check. Signed-off-by: Dave Updegraff <dave@cray.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/watchdog/Kconfig')
-rw-r--r--drivers/char/watchdog/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index f68aaa60fa8f..c0dfcf273f0a 100644
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -423,6 +423,10 @@ config 8xx_WDT
tristate "MPC8xx Watchdog Timer"
depends on WATCHDOG && 8xx
+config 83xx_WDT
+ tristate "MPC83xx Watchdog Timer"
+ depends on WATCHDOG && PPC_83xx
+
config MV64X60_WDT
tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
depends on WATCHDOG && MV64X60