Commit 1bb5a356 authored by Francois Romieu's avatar Francois Romieu Committed by David S. Miller

net: reduce USB network driver config options.

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: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ca58d62
...@@ -61,14 +61,7 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ ...@@ -61,14 +61,7 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/ obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
obj-$(CONFIG_USB_CATC) += usb/ obj-$(CONFIG_USB_NET_DRIVERS) += 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_HYPERV_NET) += hyperv/ obj-$(CONFIG_HYPERV_NET) += hyperv/
obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
# #
# USB Network devices configuration # USB Network devices configuration
# #
comment "Networking support is needed for USB Network Adapter support" comment "Host-side USB support is needed for USB Network Adapter support"
depends on USB && !NET depends on !USB && NET
menu "USB Network Adapters" menuconfig USB_NET_DRIVERS
bool "USB Network Adapters"
default y
depends on USB && NET depends on USB && NET
if USB_NET_DRIVERS
config USB_CATC config USB_CATC
tristate "USB CATC NetMate-based Ethernet device support" tristate "USB CATC NetMate-based Ethernet device support"
select CRC32 select CRC32
...@@ -568,5 +572,4 @@ config USB_VL600 ...@@ -568,5 +572,4 @@ config USB_VL600
http://ubuntuforums.org/showpost.php?p=10589647&postcount=17 http://ubuntuforums.org/showpost.php?p=10589647&postcount=17
endif # USB_NET_DRIVERS
endmenu
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