Commit 7cc543e8 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 12ff25a3 4ab102d5
...@@ -374,7 +374,7 @@ config PCWATCHDOG ...@@ -374,7 +374,7 @@ config PCWATCHDOG
tristate "Berkshire Products ISA-PC Watchdog" tristate "Berkshire Products ISA-PC Watchdog"
depends on WATCHDOG && ISA depends on WATCHDOG && ISA
---help--- ---help---
This is the driver for the Berkshire Products PC Watchdog card. This is the driver for the Berkshire Products ISA-PC Watchdog card.
This card simply watches your kernel to make sure it doesn't freeze, This card simply watches your kernel to make sure it doesn't freeze,
and if it does, it reboots your computer after a certain amount of and if it does, it reboots your computer after a certain amount of
time. This driver is like the WDT501 driver but for different time. This driver is like the WDT501 driver but for different
...@@ -406,10 +406,8 @@ config WDT ...@@ -406,10 +406,8 @@ config WDT
---help--- ---help---
If you have a WDT500P or WDT501P watchdog board, say Y here, If you have a WDT500P or WDT501P watchdog board, say Y here,
otherwise N. It is not possible to probe for this board, which means otherwise N. It is not possible to probe for this board, which means
that you have to inform the kernel about the IO port and IRQ using that you have to inform the kernel about the IO port and IRQ that
the "wdt=" kernel option (try "man bootparam" or see the is needed (you can do this via the io and irq parameters)
documentation of your boot loader (lilo or loadlin) about how to
pass options to the kernel at boot time).
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called wdt. module will be called wdt.
...@@ -425,11 +423,8 @@ config WDT_501 ...@@ -425,11 +423,8 @@ config WDT_501
Fahrenheit. This works only if you have a WDT501P watchdog board Fahrenheit. This works only if you have a WDT501P watchdog board
installed. installed.
config WDT_501_FAN If you want to enable the Fan Tachometer on the WDT501P, then you
bool "Fan Tachometer" can do this via the tachometer parameter. Only do this if you have a
depends on WDT_501
help
Enable the Fan Tachometer on the WDT501. Only do this if you have a
fan tachometer actually set up. fan tachometer actually set up.
# #
...@@ -455,30 +450,29 @@ config PCIPCWATCHDOG ...@@ -455,30 +450,29 @@ config PCIPCWATCHDOG
Most people will say N. Most people will say N.
config WDTPCI config WDTPCI
tristate "WDT PCI Watchdog timer" tristate "PCI-WDT500/501 Watchdog timer"
depends on WATCHDOG && PCI depends on WATCHDOG && PCI
---help--- ---help---
If you have a PCI WDT500/501 watchdog board, say Y here, otherwise If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
N. It is not possible to probe for this board, which means that you
have to inform the kernel about the IO port and IRQ using the "wdt="
kernel option (try "man bootparam" or see the documentation of your
boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time).
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called wdt_pci. module will be called wdt_pci.
config WDT_501_PCI config WDT_501_PCI
bool "WDT501-PCI features" bool "PCI-WDT501 features"
depends on WDTPCI depends on WDTPCI
help help
Saying Y here and creating a character special file /dev/temperature Saying Y here and creating a character special file /dev/temperature
with major number 10 and minor number 131 ("man mknod") will give with major number 10 and minor number 131 ("man mknod") will give
you a thermometer inside your computer: reading from you a thermometer inside your computer: reading from
/dev/temperature yields one byte, the temperature in degrees /dev/temperature yields one byte, the temperature in degrees
Fahrenheit. This works only if you have a WDT501P watchdog board Fahrenheit. This works only if you have a PCI-WDT501 watchdog board
installed. installed.
If you want to enable the Fan Tachometer on the PCI-WDT501, then you
can do this via the tachometer parameter. Only do this if you have a
fan tachometer actually set up.
# #
# USB-based Watchdog Cards # USB-based Watchdog Cards
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment