git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'depends/rmk/memory_h' into next/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-shmobile/include/mach/memory.h
b/arch/arm/mach-shmobile/include/mach/memory.h
index
ad00c3c
..
0ffbe81
100644
(file)
--- a/
arch/arm/mach-shmobile/include/mach/memory.h
+++ b/
arch/arm/mach-shmobile/include/mach/memory.h
@@
-4,7
+4,4
@@
#define PLAT_PHYS_OFFSET UL(CONFIG_MEMORY_START)
#define MEM_SIZE UL(CONFIG_MEMORY_SIZE)
-/* DMA memory at 0xf6000000 - 0xffdfffff */
-#define CONSISTENT_DMA_SIZE (158 << 20)
-
#endif /* __ASM_MACH_MEMORY_H */