diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-16 20:35:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-16 20:35:26 -0400 |
| commit | a54bfa40fd16aeb90bc556189221576f746f8567 (patch) | |
| tree | 176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 /arch/mn10300/unit-asb2305/unit-init.c | |
| parent | fe957c40ec5e2763b9977c565beab3bde3aaf85b (diff) | |
| parent | 134ffb4cad92a6aa534e55a9be145bca780a32c1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/mn10300/unit-asb2305/unit-init.c')
| -rw-r--r-- | arch/mn10300/unit-asb2305/unit-init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/unit-asb2305/unit-init.c b/arch/mn10300/unit-asb2305/unit-init.c index 72812a9439ac..1c452cc3f6e9 100644 --- a/arch/mn10300/unit-asb2305/unit-init.c +++ b/arch/mn10300/unit-asb2305/unit-init.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <asm/cpu/intctl-regs.h> | 18 | #include <asm/cpu/intctl-regs.h> |
| 19 | #include <asm/cpu/rtc-regs.h> | 19 | #include <asm/cpu/rtc-regs.h> |
| 20 | #include <asm/cpu/serial-regs.h> | 20 | #include <asm/cpu/serial-regs.h> |
| 21 | #include <asm/unit/serial.h> | 21 | #include <unit/serial.h> |
| 22 | 22 | ||
| 23 | /* | 23 | /* |
| 24 | * initialise some of the unit hardware before gdbstub is set up | 24 | * initialise some of the unit hardware before gdbstub is set up |