projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
arm: include asm-generic/memory_model.h from page.h rather than memory.h
[linux-2.6-microblaze.git]
/
arch
/
arm
/
include
/
asm
/
memory.h
diff --git
a/arch/arm/include/asm/memory.h
b/arch/arm/include/asm/memory.h
index
d8eef4b
..
62e9df0
100644
(file)
--- a/
arch/arm/include/asm/memory.h
+++ b/
arch/arm/include/asm/memory.h
@@
-386,6
+386,4
@@
static inline unsigned long __virt_to_idmap(unsigned long x)
#endif
-#include <asm-generic/memory_model.h>
-
#endif