Merge tag 'drm-misc-next-2018-06-21' of git://anongit.freedesktop.org/drm/drm-misc...

[mirror_ubuntu-disco-kernel.git] / drivers / gpu / drm / omapdrm / omap_gem_dmabuf.c

diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
index 8e41d649e248dd14ba6a5340c9e24db177088a6d..1a073f9b283494c9e514052de86b912f172ffe4e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c
@@ -148,8 +148,6 @@ static const struct dma_buf_ops omap_dmabuf_ops = {
        .release = drm_gem_dmabuf_release,
        .begin_cpu_access = omap_gem_dmabuf_begin_cpu_access,
        .end_cpu_access = omap_gem_dmabuf_end_cpu_access,
-       .map_atomic = omap_gem_dmabuf_kmap_atomic,
-       .unmap_atomic = omap_gem_dmabuf_kunmap_atomic,
        .map = omap_gem_dmabuf_kmap,
        .unmap = omap_gem_dmabuf_kunmap,
        .mmap = omap_gem_dmabuf_mmap,