diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 11:11:13 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 11:11:13 +0300 |
| commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
| tree | f59185b71c8059941de79143f71178453599b8f1 /arch/cris/mm/ioremap.c | |
| parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
| download | linux-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.xz | |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/cris/mm/ioremap.c')
| -rw-r--r-- | arch/cris/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/mm/ioremap.c b/arch/cris/mm/ioremap.c index 8b0b9348b574..f9ca44bdea20 100644 --- a/arch/cris/mm/ioremap.c +++ b/arch/cris/mm/ioremap.c @@ -12,7 +12,7 @@ #include <linux/vmalloc.h> #include <linux/io.h> #include <asm/pgalloc.h> -#include <asm/arch/memmap.h> +#include <arch/memmap.h> /* * Generic mapping function (not visible outside): |