diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 17:36:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-30 17:36:35 -0500 |
| commit | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (patch) | |
| tree | ae9d2dd31a35c70d9928498cc8271230838f030c /drivers | |
| parent | d145c7253c8cb2ed8a75a8839621b0bb8f778820 (diff) | |
| parent | 1ceea8243aa917ac7fc5a4a6585dea4789f7c20f (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] use SGI_HAS_INDYDOG for INDYDOG depends
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 899fc13d0612..afcdc69e37d6 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
| @@ -609,7 +609,7 @@ config SBC_EPX_C3_WATCHDOG | |||
| 609 | 609 | ||
| 610 | config INDYDOG | 610 | config INDYDOG |
| 611 | tristate "Indy/I2 Hardware Watchdog" | 611 | tristate "Indy/I2 Hardware Watchdog" |
| 612 | depends on SGI_IP22 | 612 | depends on SGI_HAS_INDYDOG |
| 613 | help | 613 | help |
| 614 | Hardware driver for the Indy's/I2's watchdog. This is a | 614 | Hardware driver for the Indy's/I2's watchdog. This is a |
| 615 | watchdog timer that will reboot the machine after a 60 second | 615 | watchdog timer that will reboot the machine after a 60 second |