diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-11-02 09:00:55 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-11-02 09:01:28 +0200 |
| commit | 7a085c3aad94cce7e11031c6800e41668418ae4c (patch) | |
| tree | b3474f8bd622f87ad39227057f9de60959c8bd95 /drivers/gpu/drm/msm/Makefile | |
| parent | 18cde299df33ff73908f7e5dcebf321fb79ed36c (diff) | |
| parent | f9885ef875e9160454392f85159163674159c51f (diff) | |
| download | linux-stable-7a085c3aad94cce7e11031c6800e41668418ae4c.tar.gz linux-stable-7a085c3aad94cce7e11031c6800e41668418ae4c.tar.bz2 linux-stable-7a085c3aad94cce7e11031c6800e41668418ae4c.zip | |
Merge drm/drm-next into drm-intel-next-queued
Although there's nothing crucial missing, it's been a long time since
the last backmerge. Catch up with drm-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/msm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/msm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile index 261fa79d456d..19ab521d4c3a 100644 --- a/drivers/gpu/drm/msm/Makefile +++ b/drivers/gpu/drm/msm/Makefile @@ -58,7 +58,6 @@ msm-y := \ disp/dpu1/dpu_formats.o \ disp/dpu1/dpu_hw_blk.o \ disp/dpu1/dpu_hw_catalog.o \ - disp/dpu1/dpu_hw_cdm.o \ disp/dpu1/dpu_hw_ctl.o \ disp/dpu1/dpu_hw_interrupts.o \ disp/dpu1/dpu_hw_intf.o \ |