Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / Kconfig

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index dc0f94f02a82edffcddbd72a19129481a8a1b891..ba3fb04bb6913de93af261f6ef9698d96bf4cc5d 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -10,13 +10,13 @@ menuconfig DRM
        depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA
        select DRM_PANEL_ORIENTATION_QUIRKS
        select HDMI
-       select FB_CMDLINE
        select I2C
        select DMA_SHARED_BUFFER
        select SYNC_FILE
 # gallium uses SYS_kcmp for os_same_file_description() to de-duplicate
 # device and dmabuf fd. Let's make sure that is available for our userspace.
        select KCMP
+       select VIDEO_CMDLINE
        select VIDEO_NOMODESET
        help
          Kernel-level support for the Direct Rendering Infrastructure (DRI)
@@ -232,6 +232,10 @@ config DRM_GEM_SHMEM_HELPER
        help
          Choose this if you need the GEM shmem helper functions
 
+config DRM_SUBALLOC_HELPER
+       tristate
+       depends on DRM
+
 config DRM_SCHED
        tristate
        depends on DRM