diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
| commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
| tree | f59185b71c8059941de79143f71178453599b8f1 /arch/cris/arch-v32/mach-a3/io.c | |
| parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/cris/arch-v32/mach-a3/io.c')
| -rw-r--r-- | arch/cris/arch-v32/mach-a3/io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-a3/io.c b/arch/cris/arch-v32/mach-a3/io.c index 9eeaf3eca47..c22f67ecd9f 100644 --- a/arch/cris/arch-v32/mach-a3/io.c +++ b/arch/cris/arch-v32/mach-a3/io.c @@ -12,7 +12,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <asm/io.h> -#include <asm/arch/mach/pinmux.h> +#include <mach/pinmux.h> #include <hwregs/gio_defs.h> struct crisv32_ioport crisv32_ioports[] = { |