diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-12-08 10:35:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-12-08 10:35:52 +1000 |
| commit | e783fd0cdc749716155ddebff660a98236f23f97 (patch) | |
| tree | 94d17162a27137b5bcd33cc93ac7b752b29bf382 /drivers/gpu/drm/Makefile | |
| parent | 3eff97b2d6d06fa381f456e5a786d576d62eb95e (diff) | |
| parent | 1de7ac686bbc5db809ab97eb715ce926a3c41a9c (diff) | |
Merge tag 'meson-drm-for-4.10' of github.com:superna9999/linux into drm-next
Add support for the Amlogic Meson Video Processing Unit
- Only CVBS/Composite output for Amlogic Meson GXBB/GXL/GXM SoCs
- Add MAINTAINERS entry
- Add DT bindings documentation
* tag 'meson-drm-for-4.10' of github.com:superna9999/linux:
MAINTAINERS: add entry for Amlogic DRM drivers
dt-bindings: display: add Amlogic Meson DRM Bindings
drm: Add support for Amlogic Meson Graphic Controller
Diffstat (limited to 'drivers/gpu/drm/Makefile')
| -rw-r--r-- | drivers/gpu/drm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index b4723e66d1d8..b9ae4280de9d 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_DRM_TEGRA) += tegra/ obj-$(CONFIG_DRM_STI) += sti/ obj-$(CONFIG_DRM_IMX) += imx/ obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ +obj-$(CONFIG_DRM_MESON) += meson/ obj-y += i2c/ obj-y += panel/ obj-y += bridge/ |