From 0949c8cdcbc6872d8205929d8718a96db468e68f Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Dec 2008 16:20:19 -0800
Subject: [PATCH] --- yaml --- r: 119659 b: refs/heads/master c:
 cd92a17eec752f8c948c4b6ab93dc099ce55b8cb h: refs/heads/master i:   119657:
 8090b12a8f3586cc1ff0aad98e79e9445bcce988   119655:
 a0d605e41be14758082da92b1ef0a12e804a53d9 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/watchdog/iTCO_wdt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bbf3c1d5f63f..7d40ec3407e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6f7b52e2f6149d2ee365717afff315b05720162
+refs/heads/master: cd92a17eec752f8c948c4b6ab93dc099ce55b8cb
diff --git a/trunk/drivers/watchdog/iTCO_wdt.c b/trunk/drivers/watchdog/iTCO_wdt.c
index 26173a270e94..5b395a4ddfdf 100644
--- a/trunk/drivers/watchdog/iTCO_wdt.c
+++ b/trunk/drivers/watchdog/iTCO_wdt.c
@@ -392,7 +392,7 @@ static int iTCO_wdt_stop(void)
 
 	/* Bit 13: TCO_EN -> 1 = Enables the TCO logic to generate SMI# */
 	val32 = inl(SMI_EN);
-	val32 &= 0x00002000;
+	val32 |= 0x00002000;
 	outl(val32, SMI_EN);
 
 	/* Set the NO_REBOOT bit to prevent later reboots, just for sure */