diff mbox

[net-next,1/1] net: reduce USB network driver config options.

Message ID 20140805211052.GA29600@electric-eye.fr.zoreil.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Francois Romieu Aug. 5, 2014, 9:10 p.m. UTC 
From: Francois Romieu <romieu@fr.zoreil.com>

USB network drivers are already handled in drivers/net/usb/Kconfig.
Let's save the maintenance burden of dependencies in drivers/net/Makefile.

The newly introduced USB_NET_DRIVERS umbrella config option defaults
to 'y' so as to minimize the changes of behavior.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---
 drivers/net/Makefile    |  9 +--------
 drivers/net/usb/Kconfig | 13 ++++++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

Comments

David Miller Aug. 5, 2014, 11:49 p.m. UTC | #1 
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Tue, 5 Aug 2014 23:10:52 +0200

> From: Francois Romieu <romieu@fr.zoreil.com>
> 
> USB network drivers are already handled in drivers/net/usb/Kconfig.
> Let's save the maintenance burden of dependencies in drivers/net/Makefile.
> 
> The newly introduced USB_NET_DRIVERS umbrella config option defaults
> to 'y' so as to minimize the changes of behavior.
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>

Looks great, applied, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fa49d45..61aefdd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -61,14 +61,7 @@  obj-$(CONFIG_VMXNET3) += vmxnet3/
 obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
 obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
 
-obj-$(CONFIG_USB_CATC)          += usb/
-obj-$(CONFIG_USB_KAWETH)        += usb/
-obj-$(CONFIG_USB_PEGASUS)       += usb/
-obj-$(CONFIG_USB_RTL8150)       += usb/
-obj-$(CONFIG_USB_HSO)		+= usb/
-obj-$(CONFIG_USB_USBNET)        += usb/
-obj-$(CONFIG_USB_IPHETH)        += usb/
-obj-$(CONFIG_USB_CDC_PHONET)   += usb/
+obj-$(CONFIG_USB_NET_DRIVERS) += usb/
 
 obj-$(CONFIG_HYPERV_NET) += hyperv/
 obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 7e7269f..9f194a0 100644
--- 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
+	bool "USB Network Adapters"
+	default y
 	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