Hi Linus,

Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

This will update the following files:

drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

with these Changes:

Author: Thomas Bogendoerfer
Date: Sun Dec 2 12:54:42 2007 +0100

[WATCHDOG] use SGI_HAS_INDYDOG for INDYDOG depends

Use SGI_HAS_INDYDOG for INDYDOG depends.

Signed-off-by: Thomas Bogendoerfer
Signed-off-by: Wim Van Sebroeck
Cc: Ralf Baechle
Signed-off-by: Andrew Morton

The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/k....git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================== ==============================
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/