Skip to content

L
linux
Commit 5bdeae46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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
parents d145c725 1ceea824
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/watchdog/Kconfig
View file @ 5bdeae46
...@@ -609,7 +609,7 @@ config SBC_EPX_C3_WATCHDOG ...@@ -609,7 +609,7 @@ config SBC_EPX_C3_WATCHDOG
config INDYDOG config INDYDOG
tristate "Indy/I2 Hardware Watchdog" tristate "Indy/I2 Hardware Watchdog"
depends on SGI_IP22 depends on SGI_HAS_INDYDOG
help help
Hardware driver for the Indy's/I2's watchdog. This is a Hardware driver for the Indy's/I2's watchdog. This is a
watchdog timer that will reboot the machine after a 60 second watchdog timer that will reboot the machine after a 60 second
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7