diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-02-28 16:57:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-02-28 16:57:02 +1100 |
| commit | eed7eb5d5999d478d4cb8e952b07d5095663fb1e (patch) | |
| tree | b70f0e1820911e13eb08c8a7130546e57bd7e230 /arch/arm/mm/mm.h | |
| parent | fce841796b5a424a966e9adc4475565312b5895c (diff) | |
| parent | 8fa5e75ac231434200bf32cba57efd96c3ac1bb9 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/arm/mm/mm.h')
| -rw-r--r-- | arch/arm/mm/mm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index 7ea641b7aa7d..64a40d63cad5 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h @@ -81,10 +81,8 @@ extern __init void add_static_vm_early(struct static_vm *svm); #endif #ifdef CONFIG_ZONE_DMA -extern phys_addr_t arm_dma_limit; extern unsigned long arm_dma_pfn_limit; #else -#define arm_dma_limit ((phys_addr_t)~0) #define arm_dma_pfn_limit (~0ul >> PAGE_SHIFT) #endif |