diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /arch/mn10300/kernel/gdb-io-serial.c | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/gdb-io-serial.c')
| -rw-r--r-- | arch/mn10300/kernel/gdb-io-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c index 11584c51acd9..ae663dc717e9 100644 --- a/arch/mn10300/kernel/gdb-io-serial.c +++ b/arch/mn10300/kernel/gdb-io-serial.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <asm/gdb-stub.h> | 22 | #include <asm/gdb-stub.h> |
| 23 | #include <asm/exceptions.h> | 23 | #include <asm/exceptions.h> |
| 24 | #include <asm/serial-regs.h> | 24 | #include <asm/serial-regs.h> |
| 25 | #include <asm/unit/serial.h> | 25 | #include <unit/serial.h> |
| 26 | 26 | ||
| 27 | /* | 27 | /* |
| 28 | * initialise the GDB stub | 28 | * initialise the GDB stub |