summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/Kconfig
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2013-02-21 09:31:47 +1000
committerDave Airlie <airlied@redhat.com>2013-02-21 09:31:47 +1000
commitca18e1426bb2db987b67030256477c9571aebd09 (patch)
tree72e7cbe5f00f90390d00f5d3d4c9bdec79e48bbe /drivers/gpu/drm/Kconfig
parent74e1697478ffdee0e12e48db024a9b3677fd8cee (diff)
parent0d4bbaf9f3e5b9f52150ddc5a4ee8b0ab83a440b (diff)
downloadblackbird-op-linux-ca18e1426bb2db987b67030256477c9571aebd09.tar.gz
blackbird-op-linux-ca18e1426bb2db987b67030256477c9571aebd09.zip
Merge branch 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux into drm-next
KMS driver for TI LCD controller * 'tilcdc-next' of git://people.freedesktop.org/~robclark/linux: drm/tilcdc: add support for LCD panels (v5) drm/tilcdc: add encoder slave (v2) drm/i2c: nxp-tda998x (v3) drm/tilcdc: add TI LCD Controller DRM driver (v4) drm/nouveau: use i2c encoder helper wrappers drm: i2c encoder helper wrappers drm/cma: add debugfs helpers drm: small fix in drm_send_vblank_event() drm: Don't set the plane->fb to NULL on successfull set_plane drm/cma-helper: fixup compilation Conflicts: drivers/gpu/drm/Kconfig drivers/gpu/drm/Makefile drivers/gpu/drm/drm_fb_cma_helper.c
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 0ce5f52ac56e..f8dae851130c 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -217,3 +217,5 @@ source "drivers/gpu/drm/shmobile/Kconfig"
source "drivers/gpu/drm/tegra/Kconfig"
source "drivers/gpu/drm/omapdrm/Kconfig"
+
+source "drivers/gpu/drm/tilcdc/Kconfig"
OpenPOWER on IntegriCloud