Merge tag 'nfs-for-3.17-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / drivers / net / usb / Kconfig

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 7e7269fd3707728d16705fc27c93c2f7a45b666f..37eed4d84e9cb458b2ac5d3b7248b0835115c67a 100644 (file)
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -1,12 +1,16 @@
 #
 # USB Network devices configuration
 #
-comment "Networking support is needed for USB Network Adapter support"
-       depends on USB && !NET
+comment "Host-side USB support is needed for USB Network Adapter support"
+       depends on !USB && NET
 
-menu "USB Network Adapters"
+menuconfig USB_NET_DRIVERS
+       tristate "USB Network Adapters"
+       default USB if USB
        depends on USB && NET
 
+if USB_NET_DRIVERS
+
 config USB_CATC
        tristate "USB CATC NetMate-based Ethernet device support"
        select CRC32
@@ -568,5 +572,4 @@ config USB_VL600
 
          http://ubuntuforums.org/showpost.php?p=10589647&postcount=17
 
-
-endmenu
+endif # USB_NET_DRIVERS