diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:07:18 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:07:18 -0800 |
commit | 68cc8301b45dee5de275a477a60f77f5560c8ca0 (patch) | |
tree | 022a6c9dd2c1a20d8e7fd415e62d9a8b55337201 /drivers/watchdog/Kconfig | |
parent | 11df5864075f763ec0d1fdecd6a3f0af7d09a553 (diff) | |
parent | 12d60e28bed3f593aac5385acbdbb089eb8ae21e (diff) | |
download | linux-68cc8301b45dee5de275a477a60f77f5560c8ca0.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] iTCO_wdt: fix SMI_EN regression 2
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 09a3d5522b43..325c10ff6a2c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -406,7 +406,7 @@ config ITCO_WDT ---help--- Hardware driver for the intel TCO timer based watchdog devices. These drivers are included in the Intel 82801 I/O Controller - Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB + Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB controller hub. The TCO (Total Cost of Ownership) timer is a watchdog timer |