summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 12:48:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-17 12:48:52 -0700
commitefcbae253f97bf82e7befd372da3ad5995a53f1a (patch)
treefbbba7dc1af78b341fbaab0bf329d343accff4ea
parent54a772b8aace3df8ad6af0bd0748f57d27f72b1d (diff)
parentf71d26bb6503e9b11b91444819b2f96872baaab8 (diff)
downloadop-kernel-dev-efcbae253f97bf82e7befd372da3ad5995a53f1a.zip
op-kernel-dev-efcbae253f97bf82e7befd372da3ad5995a53f1a.tar.gz
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
-rw-r--r--drivers/watchdog/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9536d38..21d816e 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -599,8 +599,7 @@ config IT87_WDT
config HP_WATCHDOG
tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
- depends on X86
- default m
+ depends on X86 && PCI
help
A software monitoring watchdog and NMI sourcing driver. This driver
will detect lockups and provide a stack trace. This is a driver that
OpenPOWER on IntegriCloud