diff options
| author |   Dave Airlie <airlied@redhat.com> | 2019-02-01 09:51:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-01 10:01:50 +1000 |
| commit | 74b7d6a91311766ab6c94f6be21bd423021ca95e (patch) | |
| tree | 7b4540d08d37894033bc148d87e0e6cca3a6002b /drivers/gpu/drm/Makefile | |
| parent | Merge tag 'drm-intel-next-2019-01-24' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| parent | drm/komeda: Off by one in komeda_fb_get_pixel_addr() (diff) | |
| download | linux-dev-74b7d6a91311766ab6c94f6be21bd423021ca95e.tar.xz linux-dev-74b7d6a91311766ab6c94f6be21bd423021ca95e.zip | |
Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
This pull includes the new Arm "komeda" DRM driver. It is currently hosted
in the same repo as the other "mali-dp" driver because it is the next
iteration of the IP.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Liviu Dudau <Liviu.Dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190131173600.GN25147@e110455-lin.cambridge.arm.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 ce8d1d384319..f0c1f8731a27 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -51,7 +51,7 @@ obj-$(CONFIG_DRM_DEBUG_SELFTEST) += selftests/ obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o -obj-$(CONFIG_DRM_ARM) += arm/ +obj-y += arm/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_SCHED) += scheduler/ obj-$(CONFIG_DRM_TDFX) += tdfx/ |