projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
arch
/
arm
/
mach-clps711x
/
mm.c
diff --git
a/arch/arm/mach-clps711x/mm.c
b/arch/arm/mach-clps711x/mm.c
index a00f77ef8df83cdd3a6d530b7e1414eb0dfe0b75..a7b4591205a3d484f8713ef35b619ac4140648cc 100644
(file)
--- a/
arch/arm/mach-clps711x/mm.c
+++ b/
arch/arm/mach-clps711x/mm.c
@@
-25,7
+25,7
@@
#include <linux/bootmem.h>
#include <asm/sizes.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/pgtable.h>
#include <asm/page.h>
#include <asm/mach/map.h>