diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-05-08 00:35:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:20 -0700 |
| commit | 79df3c19aa601d264719b04e3a788a7b852f4859 (patch) | |
| tree | e1116b944c765af869ae9315a744a75462405459 | |
| parent | cc38682f356f95ca0e409679b76db46af6036460 (diff) | |
| download | blackbird-op-linux-79df3c19aa601d264719b04e3a788a7b852f4859.tar.gz blackbird-op-linux-79df3c19aa601d264719b04e3a788a7b852f4859.zip | |
no longer #include <asm/kdebug.h>
Include the new linux/kdebug.h instead of asm/kdebug.h.
Simply remove the asm/kdebug.h include if both had been included.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/s390/kernel/dis.c | 2 | ||||
| -rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c index dabaf98943d0..a057ebf108a7 100644 --- a/arch/s390/kernel/dis.c +++ b/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/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index b6a972ed5bb3..147c12047cf3 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/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 |
