diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 11:03:38 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 11:03:38 +0300 |
| commit | 90accd6fabf9b2fa2705945a4c601877a75d43bf (patch) | |
| tree | d393cb54f0228b1313139e4e14adf4f5cf236b59 /drivers/serial/crisv10.h | |
| parent | b43d196c4d3fe46d6dda7c987c47792612b80b1b (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
| download | linux-90accd6fabf9b2fa2705945a4c601877a75d43bf.tar.xz | |
Merge branch 'linus' into x86/memory-corruption-check
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 */ |