diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:10:22 -0500 |
| commit | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (patch) | |
| tree | fdde7380d2584d0297898373831f26cd5208cabd /drivers/watchdog/Kconfig | |
| parent | 51badebdcf394cc5fd574a524b55b3f6085e5e9c (diff) | |
| parent | 6d5355998a757a16815d58da4a739b15a6efbfba (diff) | |
Merge commit 'gcl/next' into next
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 3711b888d482..d958b76430a2 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -861,8 +861,10 @@ config GEF_WDT | |||
| 861 | Watchdog timer found in a number of GE Fanuc single board computers. | 861 | Watchdog timer found in a number of GE Fanuc single board computers. |
| 862 | 862 | ||
| 863 | config MPC5200_WDT | 863 | config MPC5200_WDT |
| 864 | tristate "MPC5200 Watchdog Timer" | 864 | bool "MPC52xx Watchdog Timer" |
| 865 | depends on PPC_MPC52xx | 865 | depends on PPC_MPC52xx |
| 866 | help | ||
| 867 | Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog. | ||
| 866 | 868 | ||
| 867 | config 8xxx_WDT | 869 | config 8xxx_WDT |
| 868 | tristate "MPC8xxx Platform Watchdog Timer" | 870 | tristate "MPC8xxx Platform Watchdog Timer" |