diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-20 05:58:27 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-20 05:58:27 +0100 |
| commit | 8d73f102d9606fe217a9577a437f84b9fed6d45d (patch) | |
| tree | 6a186af04bf971e3abf85e13ae191c3dc781dda1 /drivers | |
| parent | powerpc/mm: Unify PTE_RPN_SHIFT and _PAGE_CHG_MASK definitions (diff) | |
| parent | powerpc/86xx: Default configuration for GE Fanuc's PPC9A (diff) | |
| download | linux-8d73f102d9606fe217a9577a437f84b9fed6d45d.tar.xz linux-8d73f102d9606fe217a9577a437f84b9fed6d45d.zip | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'drivers')
| -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 c7352f7195ee..ecf52e4b80f8 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 || GEF_SBC310 + depends on GEF_SBC610 || GEF_SBC310 || GEF_PPC9A ---help--- Watchdog timer found in a number of GE Fanuc single board computers. |