summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-12-08 13:45:18 +1000
committerDave Airlie <airlied@redhat.com>2014-12-08 13:45:18 +1000
commitb75478d1c7e4758abcf15c8494d70d4dc4dcb553 (patch)
treefcb297f559a1d95cc94a5eb13eb1055b5bed3e9e /drivers/gpu/drm/Kconfig
parentb00ff043d164bba5d43cbac42bdf0aeeb43fbda8 (diff)
parent5ac4837b12f533de5d9f8f66b45494c58e805536 (diff)
downloadlinux-b75478d1c7e4758abcf15c8494d70d4dc4dcb553.tar.bz2
Merge branch 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip into drm-next
Merge rockchip GPU support. This has a branch in common with the iommu tree, hopefully the process works. * 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip: dt-bindings: video: Add documentation for rockchip vop dt-bindings: video: Add for rockchip display subsytem drm: rockchip: Add basic drm driver dt-bindings: iommu: Add documentation for rockchip iommu iommu/rockchip: rk3288 iommu driver
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 24c2d7caedd5..c3413b6adb17 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -167,6 +167,8 @@ config DRM_SAVAGE
source "drivers/gpu/drm/exynos/Kconfig"
+source "drivers/gpu/drm/rockchip/Kconfig"
+
source "drivers/gpu/drm/vmwgfx/Kconfig"
source "drivers/gpu/drm/gma500/Kconfig"