usb: musb: blackfin: remove incorrect __exit_p()

[deliverable/linux.git] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index c4880fc0d86e003754d36538d7e1ec333fc8c766..65f7f126552251973f0c9679757cebb98c7d4a70 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -190,6 +190,12 @@ config USB_F_UAC2
 config USB_F_UVC
        tristate
 
+config USB_F_MIDI
+       tristate
+
+config USB_F_HID
+       tristate
+
 choice
        tristate "USB Gadget Drivers"
        default USB_ETH
@@ -362,6 +368,72 @@ config USB_CONFIGFS_F_FS
          implemented in kernel space (for instance Ethernet, serial or
          mass storage) and other are implemented in user space.
 
+config USB_CONFIGFS_F_UAC1
+       boolean "Audio Class 1.0"
+       depends on USB_CONFIGFS
+       depends on SND
+       select USB_LIBCOMPOSITE
+       select SND_PCM
+       select USB_F_UAC1
+       help
+         This Audio function implements 1 AudioControl interface,
+         1 AudioStreaming Interface each for USB-OUT and USB-IN.
+         This driver requires a real Audio codec to be present
+         on the device.
+
+config USB_CONFIGFS_F_UAC2
+       boolean "Audio Class 2.0"
+       depends on USB_CONFIGFS
+       depends on SND
+       select USB_LIBCOMPOSITE
+       select SND_PCM
+       select USB_F_UAC2
+       help
+         This Audio function is compatible with USB Audio Class
+         specification 2.0. It implements 1 AudioControl interface,
+         1 AudioStreaming Interface each for USB-OUT and USB-IN.
+         This driver doesn't expect any real Audio codec to be present
+         on the device - the audio streams are simply sinked to and
+         sourced from a virtual ALSA sound card created. The user-space
+         application may choose to do whatever it wants with the data
+         received from the USB Host and choose to provide whatever it
+         wants as audio data to the USB Host.
+
+config USB_CONFIGFS_F_MIDI
+       boolean "MIDI function"
+       depends on USB_CONFIGFS
+       depends on SND
+       select USB_LIBCOMPOSITE
+       select SND_RAWMIDI
+       select USB_F_MIDI
+       help
+         The MIDI Function acts as a USB Audio device, with one MIDI
+         input and one MIDI output. These MIDI jacks appear as
+         a sound "card" in the ALSA sound system. Other MIDI
+         connections can then be made on the gadget system, using
+         ALSA's aconnect utility etc.
+
+config USB_CONFIGFS_F_HID
+       boolean "HID function"
+       depends on USB_CONFIGFS
+       select USB_F_HID
+       help
+         The HID function driver provides generic emulation of USB
+         Human Interface Devices (HID).
+
+         For more information, see Documentation/usb/gadget_hid.txt.
+
+config USB_CONFIGFS_F_UVC
+       boolean "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