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: hpwdt depends on PCI watchdog: fix hpwdt Kconfig regression in 3.0-rc
This commit is contained in:
commit
efcbae253f
@ -599,8 +599,7 @@ config IT87_WDT
|
|||||||
|
|
||||||
config HP_WATCHDOG
|
config HP_WATCHDOG
|
||||||
tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
|
tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
|
||||||
depends on X86
|
depends on X86 && PCI
|
||||||
default m
|
|
||||||
help
|
help
|
||||||
A software monitoring watchdog and NMI sourcing driver. This driver
|
A software monitoring watchdog and NMI sourcing driver. This driver
|
||||||
will detect lockups and provide a stack trace. This is a driver that
|
will detect lockups and provide a stack trace. This is a driver that
|
||||||
|
Loading…
Reference in New Issue
Block a user