summaryrefslogtreecommitdiff
path: root/drivers/media/platform/Kconfig
diff options
context:
space:
mode:
authorDong Aisheng <aisheng.dong@nxp.com>2019-12-02 18:00:51 +0800
committerDong Aisheng <aisheng.dong@nxp.com>2019-12-02 18:00:51 +0800
commitb8cb1caf1eba91d5f9686af6a089da4380cf9c12 (patch)
treeb0c32f416969b8c18c158f6e028454d7a421ecc2 /drivers/media/platform/Kconfig
parent9c17c116048937e39bbfb8ac97d5c1e5c4d095bf (diff)
parent9ee1187583796a21515fa2c04a6511f739059036 (diff)
Merge remote-tracking branch 'origin/capture/mxc' into capture/next
* origin/capture/mxc: (11 commits) media: v4l2: vadc: Enable vadc driver media: mx6s_capture: accommodate the driver to framework's change media: v4l2 capture: add v4l2 capture driver based on csi media: mipi csi: add IPU CSI driver media: add adv7180 video decoder driver ...
Diffstat (limited to 'drivers/media/platform/Kconfig')
-rw-r--r--drivers/media/platform/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index e95ed50c9404..a41bb5c6300b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -147,7 +147,14 @@ config VIDEO_MX8_CAPTURE
---help---
This is the video4linux2 capture driver based on i.MX8 module.
+config VIDEO_MXC_CAPTURE
+ tristate "MXC Video For Linux Video Capture"
+ depends on VIDEO_V4L2
+ ---help---
+ This is the video4linux2 capture driver based on i.MX video-in module.
+
source "drivers/media/platform/imx8/Kconfig"
+source "drivers/media/platform/mxc/capture/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"