diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-20 14:11:17 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-20 14:11:17 +1000 |
commit | aaba64487a96df6584a05d8898634307f3c86790 (patch) | |
tree | a6a9690ee1491b7ffd3f8456c9c1575021f8d1a0 /drivers/gpu/drm/Kconfig | |
parent | d072f4654464b242e536a03102ebd3d481f6b418 (diff) | |
parent | b55a1b9c55ee9ed5b7d1d2acbabb078a454dbeea (diff) | |
download | linux-stable-aaba64487a96df6584a05d8898634307f3c86790.tar.gz linux-stable-aaba64487a96df6584a05d8898634307f3c86790.tar.bz2 linux-stable-aaba64487a96df6584a05d8898634307f3c86790.zip |
Merge branch 'drm-next-fsl-dcu' of https://github.com/Jianwei-Wang/linux-drm-fsl-dcu into drm-next
Merge Freescale DCU FRM driver.
* 'drm-next-fsl-dcu' of https://github.com/Jianwei-Wang/linux-drm-fsl-dcu:
MAINTAINERS: Add Freescale DCU DRM driver maintainer
devicetree: Add NEC to the vendor-prefix list
drm/layerscape: Add Freescale DCU DRM driver
Diffstat (limited to 'drivers/gpu/drm/Kconfig')
-rw-r--r-- | drivers/gpu/drm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index df99b0132134..1a0a8df2eed8 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -251,6 +251,8 @@ source "drivers/gpu/drm/virtio/Kconfig" source "drivers/gpu/drm/msm/Kconfig" +source "drivers/gpu/drm/fsl-dcu/Kconfig" + source "drivers/gpu/drm/tegra/Kconfig" source "drivers/gpu/drm/panel/Kconfig" |