diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 10:12:55 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-05-05 10:12:55 +0100 |
commit | f3831a592fe4332a70baad64a860b345398885b7 (patch) | |
tree | fd27b986295fe5a4f1c0924a804228f829a4c894 /arch/mn10300/kernel/gdb-io-serial-low.S | |
parent | 376f7839b72ec526173cafb5d8eadfc61e2effdf (diff) | |
parent | 8560b9321f9050968f393ce1ec67e47c1a0bd5cf (diff) | |
download | kernel-crypto-f3831a592fe4332a70baad64a860b345398885b7.tar.gz kernel-crypto-f3831a592fe4332a70baad64a860b345398885b7.tar.xz kernel-crypto-f3831a592fe4332a70baad64a860b345398885b7.zip |
Merge commit 'takashi/topic/asoc' into for-2.6.31
Diffstat (limited to 'arch/mn10300/kernel/gdb-io-serial-low.S')
-rw-r--r-- | arch/mn10300/kernel/gdb-io-serial-low.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-io-serial-low.S b/arch/mn10300/kernel/gdb-io-serial-low.S index c68dcd05220..4998b24f5d3 100644 --- a/arch/mn10300/kernel/gdb-io-serial-low.S +++ b/arch/mn10300/kernel/gdb-io-serial-low.S @@ -18,7 +18,7 @@ #include <asm/thread_info.h> #include <asm/frame.inc> #include <asm/intctl-regs.h> -#include <asm/unit/serial.h> +#include <unit/serial.h> .text |