These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / v4l2-core / Kconfig

diff --git a/kernel/drivers/media/v4l2-core/Kconfig b/kernel/drivers/media/v4l2-core/Kconfig
index ba7e21a..9beece0 100644 (file)
--- a/kernel/drivers/media/v4l2-core/Kconfig
+++ b/kernel/drivers/media/v4l2-core/Kconfig
@@ -44,6 +44,17 @@ config V4L2_MEM2MEM_DEV
         tristate
         depends on VIDEOBUF2_CORE
 
+# Used by LED subsystem flash drivers
+config V4L2_FLASH_LED_CLASS
+       tristate "V4L2 flash API for LED flash class devices"
+       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+       depends on LEDS_CLASS_FLASH
+       ---help---
+         Say Y here to enable V4L2 flash API support for LED flash
+         class drivers.
+
+         When in doubt, say N.
+
 # Used by drivers that need Videobuf modules
 config VIDEOBUF_GEN
        tristate
@@ -73,6 +84,7 @@ config VIDEOBUF2_CORE
 
 config VIDEOBUF2_MEMOPS
        tristate
+       select FRAME_VECTOR
 
 config VIDEOBUF2_DMA_CONTIG
        tristate
@@ -89,7 +101,7 @@ config VIDEOBUF2_VMALLOC
 
 config VIDEOBUF2_DMA_SG
        tristate
-       #depends on HAS_DMA
+       depends on HAS_DMA
        select VIDEOBUF2_CORE
        select VIDEOBUF2_MEMOPS