Commit eb83be98 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: remove CONFIG_EXPERIMENTAL dependancies

As discussed at the kernel summit this year, CONFIG_EXPERIMENTAL means
nothing, so let's get rid of it.
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: David Herrmann <dh.herrmann@googlemail.com>
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Neil Zhang <zhangwm@marvell.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c05fecb1
...@@ -56,7 +56,7 @@ config USB_SUSPEND ...@@ -56,7 +56,7 @@ config USB_SUSPEND
config USB_OTG config USB_OTG
bool "OTG support" bool "OTG support"
depends on USB && EXPERIMENTAL depends on USB
depends on USB_SUSPEND depends on USB_SUSPEND
default n default n
help help
......
...@@ -557,7 +557,7 @@ config USB_ZERO_HNPTEST ...@@ -557,7 +557,7 @@ config USB_ZERO_HNPTEST
one serve as the USB host instead (in the "B-Host" role). one serve as the USB host instead (in the "B-Host" role).
config USB_AUDIO config USB_AUDIO
tristate "Audio Gadget (EXPERIMENTAL)" tristate "Audio Gadget"
depends on SND depends on SND
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
select SND_PCM select SND_PCM
...@@ -672,8 +672,7 @@ config USB_G_NCM ...@@ -672,8 +672,7 @@ config USB_G_NCM
dynamically linked module called "g_ncm". dynamically linked module called "g_ncm".
config USB_GADGETFS config USB_GADGETFS
tristate "Gadget Filesystem (EXPERIMENTAL)" tristate "Gadget Filesystem"
depends on EXPERIMENTAL
help help
This driver provides a filesystem based API that lets user mode This driver provides a filesystem based API that lets user mode
programs implement a single-configuration USB device, including programs implement a single-configuration USB device, including
...@@ -681,15 +680,11 @@ config USB_GADGETFS ...@@ -681,15 +680,11 @@ config USB_GADGETFS
All endpoints, transfer speeds, and transfer types supported by All endpoints, transfer speeds, and transfer types supported by
the hardware are available, through read() and write() calls. the hardware are available, through read() and write() calls.
Currently, this option is still labelled as EXPERIMENTAL because
of existing race conditions in the underlying in-kernel AIO core.
Say "y" to link the driver statically, or "m" to build a Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "gadgetfs". dynamically linked module called "gadgetfs".
config USB_FUNCTIONFS config USB_FUNCTIONFS
tristate "Function Filesystem (EXPERIMENTAL)" tristate "Function Filesystem"
depends on EXPERIMENTAL
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
select USB_FUNCTIONFS_GENERIC if !(USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS) select USB_FUNCTIONFS_GENERIC if !(USB_FUNCTIONFS_ETH || USB_FUNCTIONFS_RNDIS)
help help
...@@ -799,8 +794,8 @@ config USB_G_SERIAL ...@@ -799,8 +794,8 @@ config USB_G_SERIAL
make MS-Windows work with CDC ACM. make MS-Windows work with CDC ACM.
config USB_MIDI_GADGET config USB_MIDI_GADGET
tristate "MIDI Gadget (EXPERIMENTAL)" tristate "MIDI Gadget"
depends on SND && EXPERIMENTAL depends on SND
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
select SND_RAWMIDI select SND_RAWMIDI
help help
...@@ -867,7 +862,7 @@ config USB_G_ACM_MS ...@@ -867,7 +862,7 @@ config USB_G_ACM_MS
dynamically linked module called "g_acm_ms". dynamically linked module called "g_acm_ms".
config USB_G_MULTI config USB_G_MULTI
tristate "Multifunction Composite Gadget (EXPERIMENTAL)" tristate "Multifunction Composite Gadget"
depends on BLOCK && NET depends on BLOCK && NET
select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS select USB_G_MULTI_CDC if !USB_G_MULTI_RNDIS
select USB_LIBCOMPOSITE select USB_LIBCOMPOSITE
......
...@@ -18,8 +18,8 @@ config USB_C67X00_HCD ...@@ -18,8 +18,8 @@ config USB_C67X00_HCD
module will be called c67x00. module will be called c67x00.
config USB_XHCI_HCD config USB_XHCI_HCD
tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)" tristate "xHCI HCD (USB 3.0) support"
depends on USB && USB_ARCH_HAS_XHCI && EXPERIMENTAL depends on USB && USB_ARCH_HAS_XHCI
---help--- ---help---
The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
"SuperSpeed" host controller hardware. "SuperSpeed" host controller hardware.
...@@ -262,7 +262,7 @@ config USB_ISP116X_HCD ...@@ -262,7 +262,7 @@ config USB_ISP116X_HCD
config USB_ISP1760_HCD config USB_ISP1760_HCD
tristate "ISP 1760 HCD support" tristate "ISP 1760 HCD support"
depends on USB && EXPERIMENTAL depends on USB
---help--- ---help---
The ISP1760 chip is a USB 2.0 host controller. The ISP1760 chip is a USB 2.0 host controller.
...@@ -376,7 +376,7 @@ config USB_OHCI_HCD_PCI ...@@ -376,7 +376,7 @@ config USB_OHCI_HCD_PCI
config USB_OHCI_HCD_SSB config USB_OHCI_HCD_SSB
bool "OHCI support for Broadcom SSB OHCI core (DEPRECATED)" bool "OHCI support for Broadcom SSB OHCI core (DEPRECATED)"
depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD)
select USB_HCD_SSB select USB_HCD_SSB
select USB_OHCI_HCD_PLATFORM select USB_OHCI_HCD_PLATFORM
default n default n
...@@ -414,7 +414,7 @@ config USB_CNS3XXX_OHCI ...@@ -414,7 +414,7 @@ config USB_CNS3XXX_OHCI
config USB_OHCI_HCD_PLATFORM config USB_OHCI_HCD_PLATFORM
bool "Generic OHCI driver for a platform device" bool "Generic OHCI driver for a platform device"
depends on USB_OHCI_HCD && EXPERIMENTAL depends on USB_OHCI_HCD
default n default n
---help--- ---help---
Adds an OHCI host driver for a generic platform device, which Adds an OHCI host driver for a generic platform device, which
...@@ -424,7 +424,7 @@ config USB_OHCI_HCD_PLATFORM ...@@ -424,7 +424,7 @@ config USB_OHCI_HCD_PLATFORM
config USB_EHCI_HCD_PLATFORM config USB_EHCI_HCD_PLATFORM
bool "Generic EHCI driver for a platform device" bool "Generic EHCI driver for a platform device"
depends on USB_EHCI_HCD && EXPERIMENTAL depends on USB_EHCI_HCD
default n default n
---help--- ---help---
Adds an EHCI host driver for a generic platform device, which Adds an EHCI host driver for a generic platform device, which
...@@ -591,8 +591,7 @@ config USB_RENESAS_USBHS_HCD ...@@ -591,8 +591,7 @@ config USB_RENESAS_USBHS_HCD
module will be called renesas-usbhs. module will be called renesas-usbhs.
config USB_WHCI_HCD config USB_WHCI_HCD
tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)" tristate "Wireless USB Host Controller Interface (WHCI) driver"
depends on EXPERIMENTAL
depends on PCI && USB && UWB depends on PCI && USB && UWB
select USB_WUSB select USB_WUSB
select UWB_WHCI select UWB_WHCI
...@@ -604,8 +603,7 @@ config USB_WHCI_HCD ...@@ -604,8 +603,7 @@ config USB_WHCI_HCD
will be called "whci-hcd". will be called "whci-hcd".
config USB_HWA_HCD config USB_HWA_HCD
tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)" tristate "Host Wire Adapter (HWA) driver"
depends on EXPERIMENTAL
depends on USB && UWB depends on USB && UWB
select USB_WUSB select USB_WUSB
select UWB_HWA select UWB_HWA
...@@ -656,7 +654,7 @@ config USB_OCTEON2_COMMON ...@@ -656,7 +654,7 @@ config USB_OCTEON2_COMMON
config USB_HCD_BCMA config USB_HCD_BCMA
tristate "BCMA usb host driver" tristate "BCMA usb host driver"
depends on BCMA && EXPERIMENTAL depends on BCMA
select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
help help
...@@ -668,7 +666,7 @@ config USB_HCD_BCMA ...@@ -668,7 +666,7 @@ config USB_HCD_BCMA
config USB_HCD_SSB config USB_HCD_SSB
tristate "SSB usb host driver" tristate "SSB usb host driver"
depends on SSB && EXPERIMENTAL depends on SSB
select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
help help
......
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
# Wireless USB Core configuration # Wireless USB Core configuration
# #
config USB_WUSB config USB_WUSB
tristate "Enable Wireless USB extensions (EXPERIMENTAL)" tristate "Enable Wireless USB extensions"
depends on EXPERIMENTAL
depends on USB depends on USB
depends on PCI depends on PCI
depends on UWB depends on UWB
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment