Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79df3c19 authored May 08, 2007 by Adrian Bunk Committed by Linus Torvalds May 08, 2007

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>

parent cc38682f

arch/s390/kernel/dis.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@
	#include <linux/kallsyms.h>		#include <linux/kallsyms.h>
	#include <linux/reboot.h>		#include <linux/reboot.h>
	#include <linux/kprobes.h>		#include <linux/kprobes.h>
			#include <linux/kdebug.h>

	#include <asm/system.h>		#include <asm/system.h>
	#include <asm/uaccess.h>		#include <asm/uaccess.h>
	@@ -33,7 +34,6 @@
	#include <asm/s390_ext.h>		#include <asm/s390_ext.h>
	#include <asm/lowcore.h>		#include <asm/lowcore.h>
	#include <asm/debug.h>		#include <asm/debug.h>
	#include <asm/kdebug.h>

	#ifndef CONFIG_64BIT		#ifndef CONFIG_64BIT
	#define ONELONG "%08lx: "		#define ONELONG "%08lx: "

drivers/char/ipmi/ipmi_watchdog.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,6 @@
	how it will work. So in the unlikely event that another		how it will work. So in the unlikely event that another
	architecture supports this, we can figure out a good generic		architecture supports this, we can figure out a good generic
	mechanism for it at that time. */		mechanism for it at that time. */
	#include <asm/kdebug.h>
	#define HAVE_DIE_NMI_POST		#define HAVE_DIE_NMI_POST
	#endif		#endif