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 'slub/lockless' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
memory.h
diff --git
a/arch/arm/mach-pxa/include/mach/memory.h
b/arch/arm/mach-pxa/include/mach/memory.h
index
07734f3
..
d05a597
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/memory.h
+++ b/
arch/arm/mach-pxa/include/mach/memory.h
@@
-17,8
+17,4
@@
*/
#define PLAT_PHYS_OFFSET UL(0xa0000000)
-#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
-#define ARM_DMA_ZONE_SIZE SZ_64M
-#endif
-
#endif