]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2f8cecc39899941e55262f16e5662c09d4b1e232
tree7d4558de387fe7075f2169479968e28fb90c60a6
parentd0ccea0e08769e9c8b510cdf6e89fcdc09c5704f
watchdog: fix hpwdt Kconfig regression in 3.0-rc

Remove Kconfig regression caused by commit
8894cc30d51d80917a38ede1feba956613e6ae22 "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