Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / exynos / exynos_drm_dmabuf.h

diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
index 49acfafb4fdb60852139fc5745fdbad867193ad4..886de9ff484dd6bf4f1fd2228312cd91ebce91f1 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.h
@@ -12,14 +12,9 @@
 #ifndef _EXYNOS_DRM_DMABUF_H_
 #define _EXYNOS_DRM_DMABUF_H_
 
-#ifdef CONFIG_DRM_EXYNOS_DMABUF
 struct dma_buf *exynos_dmabuf_prime_export(struct drm_device *drm_dev,
                                struct drm_gem_object *obj, int flags);
 
 struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,
                                                struct dma_buf *dma_buf);
-#else
-#define exynos_dmabuf_prime_export             NULL
-#define exynos_dmabuf_prime_import             NULL
-#endif
 #endif