Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index c523f9457c7321fa88aa95e9bd56c40fcb725046..b454d05be5838e08ecdda4fd60514ad0f444edc9 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -423,6 +423,17 @@ config USB_CONFIGFS_F_HID
 
          For more information, see Documentation/usb/gadget_hid.txt.
 
+config USB_CONFIGFS_F_UVC
+       bool "USB Webcam function"
+       depends on USB_CONFIGFS
+       depends on VIDEO_DEV
+       select VIDEOBUF2_VMALLOC
+       select USB_F_UVC
+       help
+         The Webcam function acts as a composite USB Audio and Video Class
+         device. It provides a userspace API to process UVC control requests
+         and stream video data to the host.
+
 source "drivers/usb/gadget/legacy/Kconfig"
 
 endchoice