---

yaml
---
r: 195435
b: refs/heads/master
c: a991412
h: refs/heads/master
i:
  195433: 48875c6
  195431: 532971c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdda479f15cd13fa50a913ca85129c0437cc7b91
+refs/heads/master: a9914127e834acf648a96c72b4e271dc0c1c7c74

trunk/drivers/usb/gadget/Kconfig

@@ -877,8 +877,15 @@ config USB_G_HID
 
 # put drivers that need isochronous transfer support (for audio
 # or video class gadget drivers), or specific hardware, here.
+config USB_G_WEBCAM
+	tristate "USB Webcam Gadget"
+	help
+	  The Webcam Gadget 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.
 
-# - none yet
+	  Say "y" to link the driver statically, or "m" to build a
+	  dynamically linked module called "g_webcam".
 
 endchoice
 

trunk/drivers/usb/gadget/Makefile

@@ -45,6 +45,7 @@ g_cdc-objs			:= cdc2.o
 g_multi-objs			:= multi.o
 g_hid-objs			:= hid.o
 g_nokia-objs			:= nokia.o
+g_webcam-objs			:= webcam.o
 
 obj-$(CONFIG_USB_ZERO)		+= g_zero.o
 obj-$(CONFIG_USB_AUDIO)		+= g_audio.o
@@ -59,4 +60,5 @@ obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o
 obj-$(CONFIG_USB_G_HID)		+= g_hid.o
 obj-$(CONFIG_USB_G_MULTI)	+= g_multi.o
 obj-$(CONFIG_USB_G_NOKIA)	+= g_nokia.o
+obj-$(CONFIG_USB_G_WEBCAM)	+= g_webcam.o