diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-13 18:02:22 -0400 |
| commit | b5c851a88a369854c04e511cefb84ea2d0cfa209 (patch) | |
| tree | 55084d3d51708f90f27d0a70db5ab63916942f14 /arch/mn10300/kernel/gdb-stub.c | |
| parent | eb02ce017dd83985041a7e54c6449f92d53b026f (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: merge latest tracing fixes to avoid conflicts in
kernel/trace/trace_events_filter.c with upcoming change
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/gdb-stub.c')
| -rw-r--r-- | arch/mn10300/kernel/gdb-stub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/kernel/gdb-stub.c b/arch/mn10300/kernel/gdb-stub.c index 0ea7482c1522..41b11706c8ed 100644 --- a/arch/mn10300/kernel/gdb-stub.c +++ b/arch/mn10300/kernel/gdb-stub.c | |||
| @@ -136,8 +136,8 @@ | |||
| 136 | #include <asm/cacheflush.h> | 136 | #include <asm/cacheflush.h> |
| 137 | #include <asm/serial-regs.h> | 137 | #include <asm/serial-regs.h> |
| 138 | #include <asm/busctl-regs.h> | 138 | #include <asm/busctl-regs.h> |
| 139 | #include <asm/unit/leds.h> | 139 | #include <unit/leds.h> |
| 140 | #include <asm/unit/serial.h> | 140 | #include <unit/serial.h> |
| 141 | 141 | ||
| 142 | /* define to use F7F7 rather than FF which is subverted by JTAG debugger */ | 142 | /* define to use F7F7 rather than FF which is subverted by JTAG debugger */ |
| 143 | #undef GDBSTUB_USE_F7F7_AS_BREAKPOINT | 143 | #undef GDBSTUB_USE_F7F7_AS_BREAKPOINT |