diff options
author | David S. Miller <davem@davemloft.net> | 2009-04-17 02:35:26 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-17 02:35:26 +0200 |
commit | a54bfa40fd16aeb90bc556189221576f746f8567 (patch) | |
tree | 176bb7a99ffab5f42f0dd4e9671f335be3f3efa0 /arch/mn10300/kernel/gdb-io-ttysm-low.S | |
parent | fec: call fec_restart() in fec_open() (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
download | linux-a54bfa40fd16aeb90bc556189221576f746f8567.tar.xz linux-a54bfa40fd16aeb90bc556189221576f746f8567.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'arch/mn10300/kernel/gdb-io-ttysm-low.S')
-rw-r--r-- | arch/mn10300/kernel/gdb-io-ttysm-low.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-io-ttysm-low.S b/arch/mn10300/kernel/gdb-io-ttysm-low.S index 677c7876307c..060b7cca735d 100644 --- a/arch/mn10300/kernel/gdb-io-ttysm-low.S +++ b/arch/mn10300/kernel/gdb-io-ttysm-low.S @@ -18,7 +18,7 @@ #include <asm/cpu-regs.h> #include <asm/frame.inc> #include <asm/intctl-regs.h> -#include <asm/unit/serial.h> +#include <unit/serial.h> #include "mn10300-serial.h" .text |