watchdog: fix hpwdt Kconfig regression in 3.0-rc
authorOlaf Hering <olaf@aepfle.de>
Fri, 15 Jul 2011 21:23:33 +0000 (23:23 +0200)
committerWim Van Sebroeck <wim@iguana.be>
Sat, 16 Jul 2011 06:06:12 +0000 (06:06 +0000)
commit2a75ca4a43e4276e6da2c75bea672a03e8e900fb
tree7d4558de387fe7075f2169479968e28fb90c60a6
parent1765a367a3b5d5e9692949b0c5ec933eff2c0701
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>
drivers/watchdog/Kconfig