diff options
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index 529f0a706909..0187b1185323 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig | |||
| @@ -316,13 +316,16 @@ config I8XX_TCO | |||
| 316 | To compile this driver as a module, choose M here: the | 316 | To compile this driver as a module, choose M here: the |
| 317 | module will be called i8xx_tco. | 317 | module will be called i8xx_tco. |
| 318 | 318 | ||
| 319 | Note: This driver will be removed in the near future. Please | ||
| 320 | use the Intel TCO Timer/Watchdog driver. | ||
| 321 | |||
| 319 | config ITCO_WDT | 322 | config ITCO_WDT |
| 320 | tristate "Intel TCO Timer/Watchdog (EXPERIMENTAL)" | 323 | tristate "Intel TCO Timer/Watchdog" |
| 321 | depends on WATCHDOG && (X86 || IA64) && PCI && EXPERIMENTAL | 324 | depends on WATCHDOG && (X86 || IA64) && PCI |
| 322 | ---help--- | 325 | ---help--- |
| 323 | Hardware driver for the intel TCO timer based watchdog devices. | 326 | Hardware driver for the intel TCO timer based watchdog devices. |
| 324 | These drivers are included in the Intel 82801 I/O Controller | 327 | These drivers are included in the Intel 82801 I/O Controller |
| 325 | Hub family 'from ICH0 up to ICH7) and in the Intel 6300ESB | 328 | Hub family (from ICH0 up to ICH8) and in the Intel 6300ESB |
| 326 | controller hub. | 329 | controller hub. |
| 327 | 330 | ||
| 328 | The TCO (Total Cost of Ownership) timer is a watchdog timer | 331 | The TCO (Total Cost of Ownership) timer is a watchdog timer |
| @@ -590,7 +593,7 @@ config SH_WDT_MMAP | |||
| 590 | help | 593 | help |
| 591 | If you say Y here, user applications will be able to mmap the | 594 | If you say Y here, user applications will be able to mmap the |
| 592 | WDT/CPG registers. | 595 | WDT/CPG registers. |
| 593 | # | 596 | |
| 594 | # SPARC64 Architecture | 597 | # SPARC64 Architecture |
| 595 | 598 | ||
| 596 | config WATCHDOG_CP1XXX | 599 | config WATCHDOG_CP1XXX |
