summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2011-07-15 21:23:33 (GMT)
committerWim Van Sebroeck <wim@iguana.be>2011-07-16 06:06:12 (GMT)
commit2a75ca4a43e4276e6da2c75bea672a03e8e900fb (patch)
tree7d4558de387fe7075f2169479968e28fb90c60a6 /drivers/watchdog
parent1765a367a3b5d5e9692949b0c5ec933eff2c0701 (diff)
downloadlinux-fsl-qoriq-2a75ca4a43e4276e6da2c75bea672a03e8e900fb.tar.xz
watchdog: fix hpwdt Kconfig regression in 3.0-rc
Remove Kconfig regression caused by commit a4616153deae053b29a2b7dd9ec4b2a225accfc5 "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>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9536d38..c57419b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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