diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 10:44:08 +0300 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 10:44:08 +0300 |
| commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
| tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /arch/arm/kernel/tcm.c | |
| parent | 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf (diff) | |
| parent | 054cfaacf88865bff1dd58d305443d5d6c068a08 (diff) | |
| download | linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'arch/arm/kernel/tcm.c')
| -rw-r--r-- | arch/arm/kernel/tcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c index 26685c2f7a49..f5cf660eefcc 100644 --- a/arch/arm/kernel/tcm.c +++ b/arch/arm/kernel/tcm.c @@ -15,7 +15,7 @@ #include <linux/string.h> /* memcpy */ #include <asm/cputype.h> #include <asm/mach/map.h> -#include <mach/memory.h> +#include <asm/memory.h> #include "tcm.h" static struct gen_pool *tcm_pool; |