diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:38:59 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2019-05-28 09:39:08 +0200 |
commit | 4672b1d65fc9b5a5ded911fbebb4853b892d5d89 (patch) | |
tree | 4ddeeb9fd195ce85f0f49525b94c39bdee8b94d9 /drivers/gpu/drm/Makefile | |
parent | cf57fdc8e42bd88dae1213a2bbe683d4b6c2190b (diff) | |
parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) | |
download | linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.tar.gz linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.tar.bz2 linux-4672b1d65fc9b5a5ded911fbebb4853b892d5d89.zip |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
This picks up rc2 for us as well.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/Makefile')
-rw-r--r-- | drivers/gpu/drm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 5fcc9bc9c97a..4a63c1fcf389 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -17,7 +17,7 @@ drm-y := drm_auth.o drm_cache.o \ drm_plane.o drm_color_mgmt.o drm_print.o \ drm_dumb_buffers.o drm_mode_config.o drm_vblank.o \ drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \ - drm_atomic_uapi.o + drm_atomic_uapi.o drm_hdcp.o drm-$(CONFIG_DRM_LEGACY) += drm_legacy_misc.o drm_bufs.o drm_context.o drm_dma.o drm_scatter.o drm_lock.o drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o |