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-io-ttysm.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-io-ttysm.c')
| -rw-r--r-- | arch/mn10300/kernel/gdb-io-ttysm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-io-ttysm.c b/arch/mn10300/kernel/gdb-io-ttysm.c index e94c25e8ca05..a560bbc3137d 100644 --- a/arch/mn10300/kernel/gdb-io-ttysm.c +++ b/arch/mn10300/kernel/gdb-io-ttysm.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 21 | #include <asm/gdb-stub.h> | 21 | #include <asm/gdb-stub.h> |
| 22 | #include <asm/exceptions.h> | 22 | #include <asm/exceptions.h> |
| 23 | #include <asm/unit/clock.h> | 23 | #include <unit/clock.h> |
| 24 | #include "mn10300-serial.h" | 24 | #include "mn10300-serial.h" |
| 25 | 25 | ||
| 26 | #if defined(CONFIG_GDBSTUB_ON_TTYSM0) | 26 | #if defined(CONFIG_GDBSTUB_ON_TTYSM0) |