]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: platform: video-mux: fix Kconfig dependency
authorArnd Bergmann <arnd@arndb.de>
Mon, 10 Jul 2017 08:48:43 +0000 (04:48 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 19 Jul 2017 19:11:42 +0000 (15:11 -0400)
When CONFIG_V4L2 is built as a loadable module, the new video mux driver
fails to link as built-in code:

drivers/media/platform/video-mux.o: In function `video_mux_remove':
video-mux.c:(.text+0x24): undefined reference to `v4l2_async_unregister_subdev'
drivers/media/platform/video-mux.o: In function `video_mux_probe':
video-mux.c:(.text+0x800): undefined reference to `v4l2_subdev_init'
video-mux.c:(.text+0xa10): undefined reference to `v4l2_async_register_subdev'

This makes it use the same Kconfig dependency as all the other users of
the VIDEO_V4L2_SUBDEV_API symbol.

Fixes: 68803ad4522f ("[media] platform: add video-multiplexer subdevice driver")
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/Kconfig

index 1313cd5334360342d776cee365c53985c82599d4..323155d6754f17b28fff9734faf2005fbabba608 100644 (file)
@@ -76,7 +76,7 @@ config VIDEO_M32R_AR_M64278
 
 config VIDEO_MUX
        tristate "Video Multiplexer"
-       depends on OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER
+       depends on VIDEO_V4L2 && OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER
        select REGMAP
        help
          This driver provides support for N:1 video bus multiplexers.