diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 15:48:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-17 15:48:52 -0400 |
| commit | efcbae253f97bf82e7befd372da3ad5995a53f1a (patch) | |
| tree | fbbba7dc1af78b341fbaab0bf329d343accff4ea | |
| parent | 54a772b8aace3df8ad6af0bd0748f57d27f72b1d (diff) | |
| parent | f71d26bb6503e9b11b91444819b2f96872baaab8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: hpwdt depends on PCI
watchdog: fix hpwdt Kconfig regression in 3.0-rc
| -rw-r--r-- | drivers/watchdog/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 9536d386bb38..21d816e9dfa5 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -599,8 +599,7 @@ config IT87_WDT | |||
| 599 | 599 | ||
| 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 && PCI |
| 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 |