Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / include / asm / mach / arch.h

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d6f98b77098dd3c831b8831f9731f49211..b99f87dd77f25845afd5390cc7f1a56cafea0ea1 100644 (file)
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -30,7 +30,7 @@ struct machine_desc {
        unsigned int            nr_irqs;        /* number of IRQs */
 
 #ifdef CONFIG_ZONE_DMA
-       unsigned long           dma_zone_size;  /* size of DMA-able area */
+       phys_addr_t             dma_zone_size;  /* size of DMA-able area */
 #endif
 
        unsigned int            video_start;    /* start of video RAM   */