Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / Kconfig

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 7fb8492..4d9f218 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -110,7 +110,7 @@ config DRM_FBDEV_OVERALLOC
 
 config DRM_LOAD_EDID_FIRMWARE
        bool "Allow to specify an EDID data set instead of probing for it"
-       depends on DRM_KMS_HELPER
+       depends on DRM
        help
          Say Y here, if you want to use EDID data to be loaded from the
          /lib/firmware directory or one of the provided built-in
@@ -281,6 +281,8 @@ source "drivers/gpu/drm/tinydrm/Kconfig"
 
 source "drivers/gpu/drm/pl111/Kconfig"
 
+source "drivers/gpu/drm/tve200/Kconfig"
+
 # Keep legacy drivers last
 
 menuconfig DRM_LEGACY