From 59c8fff54263f6f782aaa16a767f425b7de56c33 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 26 May 2011 11:12:53 +0200
Subject: [PATCH] --- yaml --- r: 254215 b: refs/heads/master c:
 e376fd664b1547e29e264e3cfb97553a1be9054b h: refs/heads/master i:   254213:
 9b692d6273dfa34272a50edf7a88cccc1d5bceda   254211:
 87449ab7971c314fa0587a74a0c1c6de9bacfee1   254207:
 ef7cc8f41f4d34c73cf9a83b0d7ba76ab14af65a v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/x86/include/asm/apb_timer.h      | 2 +-
 trunk/drivers/watchdog/Kconfig              | 3 +--
 trunk/drivers/watchdog/intel_scu_watchdog.c | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4abda8c931e7..db029dabc742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db98f89a2807966c6e82601f5c57e1a9c214c91a
+refs/heads/master: e376fd664b1547e29e264e3cfb97553a1be9054b
diff --git a/trunk/arch/x86/include/asm/apb_timer.h b/trunk/arch/x86/include/asm/apb_timer.h
index 2fefa501d3ba..af60d8a2e288 100644
--- a/trunk/arch/x86/include/asm/apb_timer.h
+++ b/trunk/arch/x86/include/asm/apb_timer.h
@@ -62,7 +62,7 @@ extern int sfi_mtimer_num;
 #else /* CONFIG_APB_TIMER */
 
 static inline unsigned long apbt_quick_calibrate(void) {return 0; }
-static inline void apbt_time_init(void) {return 0; }
+static inline void apbt_time_init(void) { }
 
 #endif
 #endif /* ASM_X86_APBT_H */
diff --git a/trunk/drivers/watchdog/Kconfig b/trunk/drivers/watchdog/Kconfig
index 022f9eb0b7bf..9536d386bb38 100644
--- a/trunk/drivers/watchdog/Kconfig
+++ b/trunk/drivers/watchdog/Kconfig
@@ -535,8 +535,7 @@ config I6300ESB_WDT
 
 config INTEL_SCU_WATCHDOG
 	bool "Intel SCU Watchdog for Mobile Platforms"
-	depends on WATCHDOG
-	depends on INTEL_SCU_IPC
+	depends on X86_MRST
 	---help---
 	  Hardware driver for the watchdog time built into the Intel SCU
 	  for Intel Mobile Platforms.
diff --git a/trunk/drivers/watchdog/intel_scu_watchdog.c b/trunk/drivers/watchdog/intel_scu_watchdog.c
index 919bdd16136f..ba4386066a42 100644
--- a/trunk/drivers/watchdog/intel_scu_watchdog.c
+++ b/trunk/drivers/watchdog/intel_scu_watchdog.c
@@ -42,7 +42,6 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/sfi.h>
-#include <linux/types.h>
 #include <asm/irq.h>
 #include <asm/atomic.h>
 #include <asm/intel_scu_ipc.h>