Merge with ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / char / watchdog / Kconfig

diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
index f0c96766ad18e20a4f43d11fef144e3d812ef40f..e4686c5f364e6b038efaaf497157b0c73dac9107 100644 (file)
--- a/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@ -346,6 +346,13 @@ config 8xx_WDT
        tristate "MPC8xx Watchdog Timer"
        depends on WATCHDOG && 8xx
 
+config BOOKE_WDT
+       tristate "PowerPC Book-E Watchdog Timer"
+       depends on WATCHDOG && (BOOKE || 4xx)
+       ---help---
+         Please see Documentation/watchdog/watchdog-api.txt for
+         more information.
+
 # MIPS Architecture
 
 config INDYDOG