diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-26 03:18:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 03:18:32 -0500 |
| commit | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 (patch) | |
| tree | 2b1052b05fa7615c817894bc9802bc5bb2af7ac1 /arch/mn10300/unit-asb2305/unit-init.c | |
| parent | 83f0d53993b2967e54186468b0fc4321447f68f1 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge commit 'v2.6.33' into tracing/core
Conflicts:
scripts/recordmcount.pl
Merge reason: Merge up to v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/unit-asb2305/unit-init.c')
| -rw-r--r-- | arch/mn10300/unit-asb2305/unit-init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c index 1c452cc3f6e9..a76c8e0ab90f 100644 --- a/arch/mn10300/unit-asb2305/unit-init.c +++ b/arch/mn10300/unit-asb2305/unit-init.c | |||
| @@ -15,9 +15,8 @@ | |||
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include <asm/setup.h> | 16 | #include <asm/setup.h> |
| 17 | #include <asm/processor.h> | 17 | #include <asm/processor.h> |
| 18 | #include <asm/cpu/intctl-regs.h> | 18 | #include <asm/intctl-regs.h> |
| 19 | #include <asm/cpu/rtc-regs.h> | 19 | #include <asm/serial-regs.h> |
| 20 | #include <asm/cpu/serial-regs.h> | ||
| 21 | #include <unit/serial.h> | 20 | #include <unit/serial.h> |
| 22 | 21 | ||
| 23 | /* | 22 | /* |