summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds2008-01-30 23:36:35 +0100
committerLinus Torvalds2008-01-30 23:36:35 +0100
commit5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (patch)
treeae9d2dd31a35c70d9928498cc8271230838f030c /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff)
parent[WATCHDOG] use SGI_HAS_INDYDOG for INDYDOG depends (diff)
downloadkernel-qcow2-linux-5bdeae46be6dfe9efa44a548bd622af325f4bdb4.tar.gz
kernel-qcow2-linux-5bdeae46be6dfe9efa44a548bd622af325f4bdb4.tar.xz
kernel-qcow2-linux-5bdeae46be6dfe9efa44a548bd622af325f4bdb4.zip
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/Kconfig2
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
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