diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-20 12:54:54 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-12-20 12:54:54 +0300 |
commit | 93b8eef1c098efbea2f1fc0be7e3c681f259a7e7 (patch) | |
tree | 462cc8c2bc07bbc825dab2a200891a28d8643329 /drivers/serial/crisv10.h | |
parent | a2d781fc8d9b16113dd9440107d73c0f21d7cbef (diff) | |
parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
download | linux-93b8eef1c098efbea2f1fc0be7e3c681f259a7e7.tar.xz |
Merge commit 'v2.6.28-rc9' into next
Diffstat (limited to 'drivers/serial/crisv10.h')
-rw-r--r-- | drivers/serial/crisv10.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h index e3c5c8c3c09b..f36a729280bc 100644 --- a/drivers/serial/crisv10.h +++ b/drivers/serial/crisv10.h @@ -10,7 +10,7 @@ #include <linux/circ_buf.h> #include <asm/termios.h> #include <asm/dma.h> -#include <asm/arch/io_interface_mux.h> +#include <arch/io_interface_mux.h> /* Software state per channel */ |