drivers/net/usb: remove depends on CONFIG_EXPERIMENTAL

The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.

CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index c1ae76968f47ee5fa0191d07f53c4b6eddd09078..4d5c34df0da40bf539c1347b0cb9f7249717c53f 100644 (file)
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -8,8 +8,7 @@ menu "USB Network Adapters"
        depends on USB && NET
 
 config USB_CATC
-       tristate "USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "USB CATC NetMate-based Ethernet device support"
        select CRC32
        ---help---
          Say Y if you want to use one of the following 10Mbps USB Ethernet
@@ -83,8 +82,7 @@ config USB_PEGASUS
          module will be called pegasus.
 
 config USB_RTL8150
-       tristate "USB RTL8150 based ethernet device support (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       tristate "USB RTL8150 based ethernet device support"
        select NET_CORE
        select MII
        help
@@ -188,7 +186,7 @@ config USB_NET_CDCETHER
 
 config USB_NET_CDC_EEM
        tristate "CDC EEM support"
-       depends on USB_USBNET && EXPERIMENTAL
+       depends on USB_USBNET
        help
          This option supports devices conforming to the Communication Device
          Class (CDC) Ethernet Emulation Model, a specification that's easy to
@@ -265,7 +263,7 @@ config USB_NET_PLUSB
        tristate "Prolific PL-2301/2302/25A1 based cables"
        # if the handshake/init/reset problems, from original 'plusb',
        # are ever resolved ... then remove "experimental"
-       depends on USB_USBNET && EXPERIMENTAL
+       depends on USB_USBNET
        help
          Choose this option if you're using a host-to-host cable
          with one of these chips.
@@ -279,8 +277,8 @@ config USB_NET_MCS7830
          adapters marketed under the DeLOCK brand.
 
 config USB_NET_RNDIS_HOST
-       tristate "Host for RNDIS and ActiveSync devices (EXPERIMENTAL)"
-       depends on USB_USBNET && EXPERIMENTAL
+       tristate "Host for RNDIS and ActiveSync devices"
+       depends on USB_USBNET
        select USB_NET_CDCETHER
        help
          This option enables hosting "Remote NDIS" USB networking links,
@@ -358,7 +356,7 @@ config USB_EPSON2888
 
 config USB_KC2190
        boolean "KT Technology KC2190 based cables (InstaNet)"
-       depends on USB_NET_CDC_SUBSET && EXPERIMENTAL
+       depends on USB_NET_CDC_SUBSET
        help
          Choose this option if you're using a host-to-host cable
          with one of these chips.