Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…
Browse files Browse the repository at this point in the history
…chdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use SGI_HAS_INDYDOG for INDYDOG depends
  • Loading branch information
Linus Torvalds committed Jan 30, 2008
2 parents d145c72 + 1ceea82 commit 5bdeae4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ config SBC_EPX_C3_WATCHDOG

config INDYDOG
tristate "Indy/I2 Hardware Watchdog"
depends on SGI_IP22
depends on SGI_HAS_INDYDOG
help
Hardware driver for the Indy's/I2's watchdog. This is a
watchdog timer that will reboot the machine after a 60 second
Expand Down

0 comments on commit 5bdeae4

Please sign in to comment.