summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-12-08 10:35:52 +1000
committerDave Airlie <airlied@redhat.com>2016-12-08 10:35:52 +1000
commite783fd0cdc749716155ddebff660a98236f23f97 (patch)
tree94d17162a27137b5bcd33cc93ac7b752b29bf382 /drivers/gpu/drm/Kconfig
parent3eff97b2d6d06fa381f456e5a786d576d62eb95e (diff)
parent1de7ac686bbc5db809ab97eb715ce926a3c41a9c (diff)
downloadop-kernel-dev-e783fd0cdc749716155ddebff660a98236f23f97.zip
op-kernel-dev-e783fd0cdc749716155ddebff660a98236f23f97.tar.gz
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/Kconfig')
-rw-r--r--drivers/gpu/drm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 726d512..ebfe840 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -242,6 +242,8 @@ source "drivers/gpu/drm/zte/Kconfig"
source "drivers/gpu/drm/mxsfb/Kconfig"
+source "drivers/gpu/drm/meson/Kconfig"
+
# Keep legacy drivers last
menuconfig DRM_LEGACY
OpenPOWER on IntegriCloud