From c2aff1dd257346d13abd40e85cf4724020065839 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 8 May 2007 00:35:10 -0700
Subject: [PATCH] --- yaml --- r: 54810 b: refs/heads/master c:
 79df3c19aa601d264719b04e3a788a7b852f4859 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/s390/kernel/dis.c            | 2 +-
 trunk/drivers/char/ipmi/ipmi_watchdog.c | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aeca17e77725..c2b8d6a7a9ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc38682f356f95ca0e409679b76db46af6036460
+refs/heads/master: 79df3c19aa601d264719b04e3a788a7b852f4859
diff --git a/trunk/arch/s390/kernel/dis.c b/trunk/arch/s390/kernel/dis.c
index dabaf98943d0..a057ebf108a7 100644
--- a/trunk/arch/s390/kernel/dis.c
+++ b/trunk/arch/s390/kernel/dis.c
@@ -23,6 +23,7 @@
 #include <linux/kallsyms.h>
 #include <linux/reboot.h>
 #include <linux/kprobes.h>
+#include <linux/kdebug.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -33,7 +34,6 @@
 #include <asm/s390_ext.h>
 #include <asm/lowcore.h>
 #include <asm/debug.h>
-#include <asm/kdebug.h>
 
 #ifndef CONFIG_64BIT
 #define ONELONG "%08lx: "
diff --git a/trunk/drivers/char/ipmi/ipmi_watchdog.c b/trunk/drivers/char/ipmi/ipmi_watchdog.c
index b6a972ed5bb3..147c12047cf3 100644
--- a/trunk/drivers/char/ipmi/ipmi_watchdog.c
+++ b/trunk/drivers/char/ipmi/ipmi_watchdog.c
@@ -61,7 +61,6 @@
    how it will work.  So in the unlikely event that another
    architecture supports this, we can figure out a good generic
    mechanism for it at that time. */
-#include <asm/kdebug.h>
 #define HAVE_DIE_NMI_POST
 #endif