Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

efcbae25 · Linus Torvalds <[email protected]> · 2011-07-17 12:48:52 -07:00

* 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

Commit: efcbae253f97bf82e7befd372da3ad5995a53f1a
Parents: 54a772b8 · f71d26bb

Merge commit. Changes below are compared with the first parent: 54a772b8.

Changes

1 files changed · +1 −2

File	Status	Add	Del	Content
drivers/watchdog/Kconfig	modified	+1	−2	View file

drivers/watchdog/Kconfig

View file

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