aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/Kconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-15 00:15:50 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-18 02:00:15 -0400
commiteb83be985510ab07f05be9541adfe3d5125deb18 (patch)
tree45ba1b0e0ecde5202e8ddfd382a468b13913c835 /drivers/usb/host/Kconfig
parentc05fecb1d57e7f4dd3244c7bfaf4374b02728238 (diff)
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: Felipe 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/Kconfig')
-rw-r--r--drivers/usb/host/Kconfig22
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 13cd6d558eba..b1deb0fd4197 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -18,8 +18,8 @@ config USB_C67X00_HCD
18 module will be called c67x00. 18 module will be called c67x00.
19 19
20config USB_XHCI_HCD 20config USB_XHCI_HCD
21 tristate "xHCI HCD (USB 3.0) support (EXPERIMENTAL)" 21 tristate "xHCI HCD (USB 3.0) support"
22 depends on USB && USB_ARCH_HAS_XHCI && EXPERIMENTAL 22 depends on USB && USB_ARCH_HAS_XHCI
23 ---help--- 23 ---help---
24 The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 24 The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
25 "SuperSpeed" host controller hardware. 25 "SuperSpeed" host controller hardware.
@@ -262,7 +262,7 @@ config USB_ISP116X_HCD
262 262
263config USB_ISP1760_HCD 263config USB_ISP1760_HCD
264 tristate "ISP 1760 HCD support" 264 tristate "ISP 1760 HCD support"
265 depends on USB && EXPERIMENTAL 265 depends on USB
266 ---help--- 266 ---help---
267 The ISP1760 chip is a USB 2.0 host controller. 267 The ISP1760 chip is a USB 2.0 host controller.
268 268
@@ -376,7 +376,7 @@ config USB_OHCI_HCD_PCI
376 376
377config USB_OHCI_HCD_SSB 377config USB_OHCI_HCD_SSB
378 bool "OHCI support for Broadcom SSB OHCI core (DEPRECATED)" 378 bool "OHCI support for Broadcom SSB OHCI core (DEPRECATED)"
379 depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD) && EXPERIMENTAL 379 depends on USB_OHCI_HCD && (SSB = y || SSB = USB_OHCI_HCD)
380 select USB_HCD_SSB 380 select USB_HCD_SSB
381 select USB_OHCI_HCD_PLATFORM 381 select USB_OHCI_HCD_PLATFORM
382 default n 382 default n
@@ -414,7 +414,7 @@ config USB_CNS3XXX_OHCI
414 414
415config USB_OHCI_HCD_PLATFORM 415config USB_OHCI_HCD_PLATFORM
416 bool "Generic OHCI driver for a platform device" 416 bool "Generic OHCI driver for a platform device"
417 depends on USB_OHCI_HCD && EXPERIMENTAL 417 depends on USB_OHCI_HCD
418 default n 418 default n
419 ---help--- 419 ---help---
420 Adds an OHCI host driver for a generic platform device, which 420 Adds an OHCI host driver for a generic platform device, which
@@ -424,7 +424,7 @@ config USB_OHCI_HCD_PLATFORM
424 424
425config USB_EHCI_HCD_PLATFORM 425config USB_EHCI_HCD_PLATFORM
426 bool "Generic EHCI driver for a platform device" 426 bool "Generic EHCI driver for a platform device"
427 depends on USB_EHCI_HCD && EXPERIMENTAL 427 depends on USB_EHCI_HCD
428 default n 428 default n
429 ---help--- 429 ---help---
430 Adds an EHCI host driver for a generic platform device, which 430 Adds an EHCI host driver for a generic platform device, which
@@ -591,8 +591,7 @@ config USB_RENESAS_USBHS_HCD
591 module will be called renesas-usbhs. 591 module will be called renesas-usbhs.
592 592
593config USB_WHCI_HCD 593config USB_WHCI_HCD
594 tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)" 594 tristate "Wireless USB Host Controller Interface (WHCI) driver"
595 depends on EXPERIMENTAL
596 depends on PCI && USB && UWB 595 depends on PCI && USB && UWB
597 select USB_WUSB 596 select USB_WUSB
598 select UWB_WHCI 597 select UWB_WHCI
@@ -604,8 +603,7 @@ config USB_WHCI_HCD
604 will be called "whci-hcd". 603 will be called "whci-hcd".
605 604
606config USB_HWA_HCD 605config USB_HWA_HCD
607 tristate "Host Wire Adapter (HWA) driver (EXPERIMENTAL)" 606 tristate "Host Wire Adapter (HWA) driver"
608 depends on EXPERIMENTAL
609 depends on USB && UWB 607 depends on USB && UWB
610 select USB_WUSB 608 select USB_WUSB
611 select UWB_HWA 609 select UWB_HWA
@@ -656,7 +654,7 @@ config USB_OCTEON2_COMMON
656 654
657config USB_HCD_BCMA 655config USB_HCD_BCMA
658 tristate "BCMA usb host driver" 656 tristate "BCMA usb host driver"
659 depends on BCMA && EXPERIMENTAL 657 depends on BCMA
660 select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD 658 select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
661 select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD 659 select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
662 help 660 help
@@ -668,7 +666,7 @@ config USB_HCD_BCMA
668 666
669config USB_HCD_SSB 667config USB_HCD_SSB
670 tristate "SSB usb host driver" 668 tristate "SSB usb host driver"
671 depends on SSB && EXPERIMENTAL 669 depends on SSB
672 select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD 670 select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD
673 select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD 671 select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
674 help 672 help