diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-05-08 03:35:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:20 -0400 |
| commit | 79df3c19aa601d264719b04e3a788a7b852f4859 (patch) | |
| tree | e1116b944c765af869ae9315a744a75462405459 /arch/s390 | |
| parent | cc38682f356f95ca0e409679b76db46af6036460 (diff) | |
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>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/dis.c | 2 |
1 files changed, 1 insertions, 1 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 @@ | |||
| 23 | #include <linux/kallsyms.h> | 23 | #include <linux/kallsyms.h> |
| 24 | #include <linux/reboot.h> | 24 | #include <linux/reboot.h> |
| 25 | #include <linux/kprobes.h> | 25 | #include <linux/kprobes.h> |
| 26 | #include <linux/kdebug.h> | ||
| 26 | 27 | ||
| 27 | #include <asm/system.h> | 28 | #include <asm/system.h> |
| 28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| @@ -33,7 +34,6 @@ | |||
| 33 | #include <asm/s390_ext.h> | 34 | #include <asm/s390_ext.h> |
| 34 | #include <asm/lowcore.h> | 35 | #include <asm/lowcore.h> |
| 35 | #include <asm/debug.h> | 36 | #include <asm/debug.h> |
| 36 | #include <asm/kdebug.h> | ||
| 37 | 37 | ||
| 38 | #ifndef CONFIG_64BIT | 38 | #ifndef CONFIG_64BIT |
| 39 | #define ONELONG "%08lx: " | 39 | #define ONELONG "%08lx: " |