git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asm-generic-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mm
/
mmu.c
diff --git
a/arch/arm/mm/mmu.c
b/arch/arm/mm/mmu.c
index f3a52c08a2006f5dd56be97207c5f01c26cbd41a..13fc4bb5f7924b347cdb3246652d8c4be32cf232 100644
(file)
--- a/
arch/arm/mm/mmu.c
+++ b/
arch/arm/mm/mmu.c
@@
-27,7
+27,7
@@
#include <asm/system_info.h>
#include <asm/traps.h>
#include <asm/procinfo.h>
-#include <asm/
memory
.h>
+#include <asm/
page
.h>
#include <asm/pgalloc.h>
#include <asm/kasan_def.h>