diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 23:28:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-14 23:28:31 +0100 |
| commit | 0bdd0f385a44344f83409b9e00797bfe2596faf8 (patch) | |
| tree | 2f01d7bee085a02e147061c8e1d7b131478b4d8d /drivers/char | |
| parent | [PATCH] m68k dma-mapping: gfp_t annotations (diff) | |
| parent | [WATCHDOG] i8xx TCO driver - mark for removal (diff) | |
| download | linux-0bdd0f385a44344f83409b9e00797bfe2596faf8.tar.xz linux-0bdd0f385a44344f83409b9e00797bfe2596faf8.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] i8xx TCO driver - mark for removal
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index ea09d0c974ea..e812aa129e28 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig @@ -301,6 +301,7 @@ config I6300ESB_WDT config I8XX_TCO tristate "Intel i8xx TCO Timer/Watchdog" depends on WATCHDOG && (X86 || IA64) && PCI + default n ---help--- Hardware driver for the TCO timer built into the Intel 82801 I/O Controller Hub family. The TCO (Total Cost of Ownership) |