diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-01-19 18:32:05 +0100 |
| commit | 54156da8937c9f5f84b4215e239a61ecc7c29275 (patch) | |
| tree | 7fb1e07ebedc5fbd35a29f5d450dee538763efdb /drivers/gpu/drm/exynos/Makefile | |
| parent | drm: add kernel doc for exported gem dmabuf_ops (diff) | |
| parent | BackMerge tag 'v4.15-rc8' into drm-next (diff) | |
| download | linux-54156da8937c9f5f84b4215e239a61ecc7c29275.tar.xz linux-54156da8937c9f5f84b4215e239a61ecc7c29275.zip | |
Merge airlied/drm-next into drm-misc-next
It's been a while since we've backmerged drm-next. Dave just brought
back 4.15-rc8, so now's a good time to freshen things up around here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/exynos/Makefile')
| -rw-r--r-- | drivers/gpu/drm/exynos/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/Makefile b/drivers/gpu/drm/exynos/Makefile index bdf4212dde7b..a51c5459bb13 100644 --- a/drivers/gpu/drm/exynos/Makefile +++ b/drivers/gpu/drm/exynos/Makefile @@ -18,7 +18,6 @@ exynosdrm-$(CONFIG_DRM_EXYNOS_MIXER) += exynos_mixer.o exynosdrm-$(CONFIG_DRM_EXYNOS_HDMI) += exynos_hdmi.o exynosdrm-$(CONFIG_DRM_EXYNOS_VIDI) += exynos_drm_vidi.o exynosdrm-$(CONFIG_DRM_EXYNOS_G2D) += exynos_drm_g2d.o -exynosdrm-$(CONFIG_DRM_EXYNOS_IPP) += exynos_drm_ipp.o exynosdrm-$(CONFIG_DRM_EXYNOS_FIMC) += exynos_drm_fimc.o exynosdrm-$(CONFIG_DRM_EXYNOS_ROTATOR) += exynos_drm_rotator.o exynosdrm-$(CONFIG_DRM_EXYNOS_GSC) += exynos_drm_gsc.o |