diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:37:44 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:37:44 +1100 |
| commit | edbc29d76ddbc9bd56e1cbc772188f70c616ffe1 (patch) | |
| tree | 71b994ba493c46e10189c090fd17fe2da80281ec /drivers/watchdog/Kconfig | |
| parent | 1db8508cf483dc1ecf66141f90a7c03659d69512 (diff) | |
| parent | a0e8618c71b9b685977c1407dee928d86c5bdc2c (diff) | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 09a3d5522b4..316ee964b94 100644 --- 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 ---help--- Watchdog timer found in a number of GE Fanuc single board computers. |