projects/linux·commit 5bdeae46

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

5bdeae46 · Linus Torvalds <[email protected]> · 2008-01-31 09:36:35 +11:00

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use SGI_HAS_INDYDOG for INDYDOG depends
Commit
5bdeae46be6dfe9efa44a548bd622af325f4bdb4
Parents
d145c725 · 1ceea824

Merge commit. Changes below are compared with the first parent: d145c725.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/watchdog/Kconfigmodified+1−1View file

drivers/watchdog/Kconfig

View file
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 899fc13..afcdc69 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -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