diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-15 18:55:44 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-15 18:56:02 +0100 |
commit | 0181b61a988424b5cc44fe09e6968142359c815e (patch) | |
tree | 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5 /include/asm-arm/arch-pxa/memory.h | |
parent | 92633b72d18ca4f25de1f28e436a882159491e7e (diff) | |
parent | 87944f3361fc033b73617aa663135c6e468957a7 (diff) |
Merge branch 'pxa' into devel
Diffstat (limited to 'include/asm-arm/arch-pxa/memory.h')
-rw-r--r-- | include/asm-arm/arch-pxa/memory.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/memory.h b/include/asm-arm/arch-pxa/memory.h index e17f9881faf..bee81d66c18 100644 --- a/include/asm-arm/arch-pxa/memory.h +++ b/include/asm-arm/arch-pxa/memory.h @@ -39,4 +39,14 @@ */ #define NODE_MEM_SIZE_BITS 26 +#if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) +void cmx270_pci_adjust_zones(int node, unsigned long *size, + unsigned long *holes); + +#define arch_adjust_zones(node, size, holes) \ + cmx270_pci_adjust_zones(node, size, holes) + +#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) +#endif + #endif |