diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-08 20:23:02 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-08 20:23:02 +0100 |
commit | 895e031707954a9ca26ed4f5f794575313854ed1 (patch) | |
tree | ec7cd5515f346e6f94bc43e63d55ebc8ddf4173d /arch/cris/arch-v32/kernel/kgdb.c | |
parent | x86: Implement change_bit with immediate operand as "lock xorb" (diff) | |
parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
download | linux-895e031707954a9ca26ed4f5f794575313854ed1.tar.xz linux-895e031707954a9ca26ed4f5f794575313854ed1.zip |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/cris/arch-v32/kernel/kgdb.c')
-rw-r--r-- | arch/cris/arch-v32/kernel/kgdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/kernel/kgdb.c b/arch/cris/arch-v32/kernel/kgdb.c index 8bd5a5bc0dc7..c981fd663323 100644 --- a/arch/cris/arch-v32/kernel/kgdb.c +++ b/arch/cris/arch-v32/kernel/kgdb.c @@ -174,10 +174,10 @@ #include <asm/ptrace.h> #include <asm/irq.h> -#include <asm/arch/hwregs/reg_map.h> -#include <asm/arch/hwregs/reg_rdwr.h> -#include <asm/arch/hwregs/intr_vect_defs.h> -#include <asm/arch/hwregs/ser_defs.h> +#include <arch/hwregs/reg_map.h> +#include <arch/hwregs/reg_rdwr.h> +#include <arch/hwregs/intr_vect_defs.h> +#include <arch/hwregs/ser_defs.h> /* From entry.S. */ extern void gdb_handle_exception(void); |