Merge branch 'v3.8-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / plat-omap / fb.c

diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c
index f868caeedfd6a545ee31f279680dbc52fbdf38fe..a3367b783fc7f84c973a2dea20526dd7fc9d0a66 100644 (file)
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/plat-omap/fb.c
@@ -29,8 +29,8 @@
 #include <linux/memblock.h>
 #include <linux/io.h>
 #include <linux/omapfb.h>
+#include <linux/dma-mapping.h>
 
-#include <mach/hardware.h>
 #include <asm/mach/map.h>
 
 #include <plat/cpu.h>
@@ -106,7 +106,7 @@ static struct platform_device omap_fb_device = {
        .id             = -1,
        .dev = {
                .dma_mask               = &omap_fb_dma_mask,
-               .coherent_dma_mask      = ~(u32)0,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
                .platform_data          = &omapfb_config,
        },
        .num_resources = 0,
@@ -142,7 +142,7 @@ static struct platform_device omap_fb_device = {
        .id             = -1,
        .dev = {
                .dma_mask               = &omap_fb_dma_mask,
-               .coherent_dma_mask      = ~(u32)0,
+               .coherent_dma_mask      = DMA_BIT_MASK(32),
                .platform_data          = &omapfb_config,
        },
        .num_resources = 0,