[media] usb: gadget: uvc: add V4L2 dependency
authorArnd Bergmann <arnd@arndb.de>
Mon, 12 Sep 2016 15:34:57 +0000 (12:34 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 19 Sep 2016 19:25:54 +0000 (16:25 -0300)
Building the UVC gadget into the kernel fails to build when
CONFIG_VIDEO_V4L2 is a loadable module:

drivers/usb/gadget/function/usb_f_uvc.o: In function `uvc_function_ep0_complete':
uvc_configfs.c:(.text.uvc_function_ep0_complete+0x84): undefined reference to `v4l2_event_queue'
drivers/usb/gadget/function/usb_f_uvc.o: In function `uvc_function_disable':
uvc_configfs.c:(.text.uvc_function_disable+0x34): undefined reference to `v4l2_event_queue'

Adding a dependency in USB_CONFIGFS_F_UVC (which is a bool symbol)
make the 'select USB_F_UVC' statement turn the USB_F_UVC into 'm'
whenever CONFIG_VIDEO_V4L2=m too, avoiding the link failure.

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/usb/gadget/Kconfig

index 3c3f31ceece76b4412362a32b90d86e5e48004ed..4e7503da2fcf2a8cde0805f2f92754900b9627b9 100644 (file)
@@ -439,6 +439,7 @@ config USB_CONFIGFS_F_HID
 config USB_CONFIGFS_F_UVC
        bool "USB Webcam function"
        depends on USB_CONFIGFS
+       depends on VIDEO_V4L2
        depends on VIDEO_DEV
        select VIDEOBUF2_VMALLOC
        select USB_F_UVC