diff options
| author | Olaf Hering <olaf@aepfle.de> | 2011-07-15 17:23:33 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2011-07-16 02:06:12 -0400 |
| commit | 2a75ca4a43e4276e6da2c75bea672a03e8e900fb (patch) | |
| tree | 7d4558de387fe7075f2169479968e28fb90c60a6 /drivers/watchdog | |
| parent | 1765a367a3b5d5e9692949b0c5ec933eff2c0701 (diff) | |
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/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9536d386bb38..c57419bf08f1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -600,7 +600,6 @@ config IT87_WDT | |||
| 600 | config HP_WATCHDOG | 600 | config HP_WATCHDOG |
| 601 | tristate "HP ProLiant iLO2+ Hardware Watchdog Timer" | 601 | tristate "HP ProLiant iLO2+ Hardware Watchdog Timer" |
| 602 | depends on X86 | 602 | depends on X86 |
| 603 | default m | ||
| 604 | help | 603 | help |
| 605 | A software monitoring watchdog and NMI sourcing driver. This driver | 604 | A software monitoring watchdog and NMI sourcing driver. This driver |
| 606 | will detect lockups and provide a stack trace. This is a driver that | 605 | will detect lockups and provide a stack trace. This is a driver that |