diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:42:19 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-23 19:42:19 -0400 |
| commit | ee0736627d3347be0be2769fa7b26431f9726c9d (patch) | |
| tree | 203e2204daaec4cf005463fdf2c7bf380d6eef36 /arch/mn10300/kernel/mn10300-serial-low.S | |
| parent | cf9972a921470b0a2da7906104bcd540b20e33bf (diff) | |
| parent | 0af48f42df15b97080b450d24219dd95db7b929a (diff) | |
Merge branch 'x86/urgent' into x86/setup
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/mn10300/kernel/mn10300-serial-low.S')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial-low.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial-low.S b/arch/mn10300/kernel/mn10300-serial-low.S index ef3f4c1df2a4..224485388228 100644 --- a/arch/mn10300/kernel/mn10300-serial-low.S +++ b/arch/mn10300/kernel/mn10300-serial-low.S | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | #include <asm/cpu-regs.h> | 18 | #include <asm/cpu-regs.h> |
| 19 | #include <asm/frame.inc> | 19 | #include <asm/frame.inc> |
| 20 | #include <asm/timer-regs.h> | 20 | #include <asm/timer-regs.h> |
| 21 | #include <asm/proc/cache.h> | 21 | #include <proc/cache.h> |
| 22 | #include <asm/unit/timex.h> | 22 | #include <unit/timex.h> |
| 23 | #include "mn10300-serial.h" | 23 | #include "mn10300-serial.h" |
| 24 | 24 | ||
| 25 | #define SCxCTR 0x00 | 25 | #define SCxCTR 0x00 |