Commit efcbae25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 54a772b8 f71d26bb

drivers/watchdog/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -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