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 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-sa1100/include/mach/memory.h
b/arch/arm/mach-sa1100/include/mach/memory.h
index fa5cf474499295b1b718feaabb1980966fbb6f5c..3b19296f5062da6e1c01e36b35abad7a46e3f989 100644
(file)
--- a/
arch/arm/mach-sa1100/include/mach/memory.h
+++ b/
arch/arm/mach-sa1100/include/mach/memory.h
@@
-8,7
+8,7
@@
#ifndef __ASM_ARCH_MEMORY_H
#define __ASM_ARCH_MEMORY_H
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
/*
* Because of the wide memory address space between physical RAM banks on the