diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 02:53:01 -0400 |
| commit | 48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch) | |
| tree | 4a80e6b96321a71affd1bacea817de93be08894b /drivers/char/watchdog | |
| parent | fb8f7ba077b5c665432082ab205bcd2cb01f6a3c (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/watchdog')
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index e812aa129e28..60198a78974c 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig | |||
| @@ -548,7 +548,7 @@ config MV64X60_WDT | |||
| 548 | depends on WATCHDOG && MV64X60 | 548 | depends on WATCHDOG && MV64X60 |
| 549 | 549 | ||
| 550 | config BOOKE_WDT | 550 | config BOOKE_WDT |
| 551 | tristate "PowerPC Book-E Watchdog Timer" | 551 | bool "PowerPC Book-E Watchdog Timer" |
| 552 | depends on WATCHDOG && (BOOKE || 4xx) | 552 | depends on WATCHDOG && (BOOKE || 4xx) |
| 553 | ---help--- | 553 | ---help--- |
| 554 | Please see Documentation/watchdog/watchdog-api.txt for | 554 | Please see Documentation/watchdog/watchdog-api.txt for |