summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/Kconfig
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2017-07-18 15:26:00 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-07-20 12:59:25 +0200
commit435945e08551ef05a5e01610e042bc16df0db8de (patch)
tree8e8fa42289df495f00a66f4e2404e1018c366056 /drivers/media/platform/Kconfig
parentmedia: usbvision-i2c: fix format overflow warning (diff)
downloadlinux-435945e08551ef05a5e01610e042bc16df0db8de.tar.xz
linux-435945e08551ef05a5e01610e042bc16df0db8de.zip
media: platform: video-mux: convert to multiplexer framework
Now that the multiplexer framework is merged, drop the temporary mmio-mux implementation from the video-mux driver and convert it to use the multiplexer API. [mchehab@s-opensource.com: fix a merge conflict at Kconfig] Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/Kconfig')
-rw-r--r--drivers/media/platform/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 323155d6754f..17cffff86454 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -76,6 +76,7 @@ config VIDEO_M32R_AR_M64278
config VIDEO_MUX
tristate "Video Multiplexer"
+ select MULTIPLEXER
depends on VIDEO_V4L2 && OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER
select REGMAP
help