Commit 2a75ca4a authored Jul 15, 2011 by Olaf Hering Committed by Wim Van Sebroeck Jul 16, 2011

watchdog: fix hpwdt Kconfig regression in 3.0-rc



Remove Kconfig regression caused by commit
a4616153 "watchdog: hpwdt: build hpwdt as
module by default with NMI_DECODING enabled"

With the above change applied, hpwdt will be enabled unconditionally by just
entering the Watchdog subscreen in menuconfig. Since this driver is not
essential to boot any box it should remain disabled until it gets manually
enabled, just like all other drivers.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Tony Camuso <tcamuso@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

parent 1765a367

drivers/watchdog/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -600,7 +600,6 @@ config IT87_WDT
		config HP_WATCHDOG
		tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"
		depends on X86
		default m
		help
		A software monitoring watchdog and NMI sourcing driver. This driver
		will detect lockups and provide a stack trace. This is a driver that