Merge branch 'fixes' into for-next

[deliverable/linux.git] / drivers / gpu / drm / rockchip / rockchip_drm_gem.h

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h
index ad22618473a488b10a10e1155f85bc79e1c8870e..18b3488db4ecc21464daec73889dbb28d74018c5 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.h
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.h
@@ -23,7 +23,7 @@ struct rockchip_gem_object {
 
        void *kvaddr;
        dma_addr_t dma_addr;
-       struct dma_attrs dma_attrs;
+       unsigned long dma_attrs;
 };
 
 struct sg_table *rockchip_gem_prime_get_sg_table(struct drm_gem_object *obj);