From 726d46a020bda743423fda1d2f261a6b2b46bcbe Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Fri, 18 Jan 2008 21:01:34 +0000
Subject: [PATCH] --- yaml --- r: 75550 b: refs/heads/master c:
 cde10ba3ba439592d1bc094102ebfccdeee80cf9 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/x86/oprofile/nmi_int.c     | 2 +-
 trunk/drivers/lguest/Kconfig          | 4 ++--
 trunk/drivers/watchdog/w83697hf_wdt.c | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8dcfa049fb06..54edda166fe6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d
+refs/heads/master: cde10ba3ba439592d1bc094102ebfccdeee80cf9
diff --git a/trunk/arch/x86/oprofile/nmi_int.c b/trunk/arch/x86/oprofile/nmi_int.c
index 944bbcdd2b8d..2d0eeac7251f 100644
--- a/trunk/arch/x86/oprofile/nmi_int.c
+++ b/trunk/arch/x86/oprofile/nmi_int.c
@@ -380,7 +380,7 @@ static int __init ppro_init(char ** cpu_type)
 
 	if (cpu_model == 14)
 		*cpu_type = "i386/core";
-	else if (cpu_model == 15 || cpu_model == 23)
+	else if (cpu_model == 15)
 		*cpu_type = "i386/core_2";
 	else if (cpu_model > 0xd)
 		return 0;
diff --git a/trunk/drivers/lguest/Kconfig b/trunk/drivers/lguest/Kconfig
index 002d4f4e93c6..7eb9ecff8f4a 100644
--- a/trunk/drivers/lguest/Kconfig
+++ b/trunk/drivers/lguest/Kconfig
@@ -2,7 +2,6 @@ config LGUEST
 	tristate "Linux hypervisor example code"
 	depends on X86_32 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
 	select HVC_DRIVER
-	select LGUEST_GUEST
 	---help---
 	  This is a very simple module which allows you to run
 	  multiple instances of the same Linux kernel, using the
@@ -16,4 +15,5 @@ config LGUEST_GUEST
 	bool
 	help
 	  The guest needs code built-in, even if the host has lguest
-	  support as a module.
+	  support as a module.  The drivers are tiny, so we build them
+	  in too.
diff --git a/trunk/drivers/watchdog/w83697hf_wdt.c b/trunk/drivers/watchdog/w83697hf_wdt.c
index 6ea125eabeaa..c622a0e6c9ae 100644
--- a/trunk/drivers/watchdog/w83697hf_wdt.c
+++ b/trunk/drivers/watchdog/w83697hf_wdt.c
@@ -382,10 +382,8 @@ wdt_init(void)
 		/* we will autodetect the W83697HF/HG watchdog */
 		for (i = 0; ((!found) && (w83697hf_ioports[i] != 0)); i++) {
 			wdt_io = w83697hf_ioports[i];
-			if (!w83697hf_check_wdt()) {
+			if (!w83697hf_check_wdt())
 				found++;
-				break;
-			}
 		}
 	} else {
 		if (!w83697hf_check_wdt())