diff --git a/[refs] b/[refs] index b2cf37b67ffb..2866841e0091 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b89d607b590397c04b63d94a9e2fca9649917955 +refs/heads/master: 09b2ad13da3ac7c717dd86bfca7072d9b36f7449 diff --git a/trunk/arch/arm/mm/mm.h b/trunk/arch/arm/mm/mm.h index c471436c7952..2e8a1efdf7b8 100644 --- a/trunk/arch/arm/mm/mm.h +++ b/trunk/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;