diff options
| author | merging other branches <null@invalid> | 2008-11-26 16:07:01 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-26 16:07:01 +0000 |
| commit | 6d2c293d6578048e7b71e0c44897144f15f350ae (patch) | |
| tree | cba36be2a06ee7bfa0aab1a3c7d36bd67ea37402 /drivers/watchdog/Kconfig | |
| parent | 524f4a1dfe71a8b353a244140164e09828abb68c (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-MERGE-via-mokopatches-tracking-via-master-s3c-hsmmc-clean
balaji-tracking-hist top was efb2d57c0e0ed62324d79d6c5793fe797c157266
Diffstat (limited to 'drivers/watchdog/Kconfig')
| -rw-r--r-- | drivers/watchdog/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 4fd3fa5546b..7ec506f5014 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -233,6 +233,12 @@ config ORION5X_WATCHDOG To compile this driver as a module, choose M here: the module will be called orion5x_wdt. +config PCF50606_WATCHDOG + tristate "NXP PCF50606 Watchdog" + depends on MFD_PCF50606 + help + Say Y here to include support for NXP PCF50606 watchdog timer. + # ARM26 Architecture # AVR32 Architecture @@ -784,7 +790,7 @@ config WATCHDOG_RTAS tristate "RTAS watchdog" depends on PPC_RTAS help - This driver adds watchdog support for the RTAS watchdog. + his driver adds watchdog support for the RTAS watchdog. To compile this driver as a module, choose M here. The module will be called wdrtas. |