Merge commit 'origin/master' into next

[sfrench/cifs-2.6.git] / drivers / watchdog / Kconfig

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 55f64af072a430d4ce9337baa6b8dc6807ec3c4f..63024145215d729703961ee4c27fad4ab1d6226f 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -772,7 +772,7 @@ config TXX9_WDT
 
 config GEF_WDT
        tristate "GE Fanuc Watchdog Timer"
-       depends on GEF_SBC610
+       depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A
        ---help---
          Watchdog timer found in a number of GE Fanuc single board computers.