diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-07-17 12:04:20 +0200 |
commit | 8ce44a2174c3b07950d7a8d44774e23e60518205 (patch) | |
tree | 4bf04cdeed59775462d5326d3bcb00c7343b6163 /arch/arm/mm/mm.h | |
parent | f9a4f063a88297e361fd6676986cf3e39b22de72 (diff) | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) |
Merge tag 'v3.5-rc7' into arm/tegra
This solves the merge conflicts while creating the next
branch.
Linux 3.5-rc7
Conflicts:
drivers/iommu/tegra-smmu.c
Diffstat (limited to 'arch/arm/mm/mm.h')
-rw-r--r-- | arch/arm/mm/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index c471436c7952..2e8a1efdf7b8 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h @@ -64,7 +64,7 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page #ifdef CONFIG_ZONE_DMA extern phys_addr_t arm_dma_limit; #else -#define arm_dma_limit ((u32)~0) +#define arm_dma_limit ((phys_addr_t)~0) #endif extern phys_addr_t arm_lowmem_limit; |