diff options
| -rw-r--r-- | drivers/net/Makefile | 9 | ||||
| -rw-r--r-- | drivers/net/usb/Kconfig | 13 |
2 files changed, 9 insertions, 13 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index fa49d45f9ff6..61aefdd1e173 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -61,14 +61,7 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ | |||
| 61 | obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o | 61 | obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o |
| 62 | obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/ | 62 | obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/ |
| 63 | 63 | ||
| 64 | obj-$(CONFIG_USB_CATC) += usb/ | 64 | obj-$(CONFIG_USB_NET_DRIVERS) += usb/ |
| 65 | obj-$(CONFIG_USB_KAWETH) += usb/ | ||
| 66 | obj-$(CONFIG_USB_PEGASUS) += usb/ | ||
| 67 | obj-$(CONFIG_USB_RTL8150) += usb/ | ||
| 68 | obj-$(CONFIG_USB_HSO) += usb/ | ||
| 69 | obj-$(CONFIG_USB_USBNET) += usb/ | ||
| 70 | obj-$(CONFIG_USB_IPHETH) += usb/ | ||
| 71 | obj-$(CONFIG_USB_CDC_PHONET) += usb/ | ||
| 72 | 65 | ||
| 73 | obj-$(CONFIG_HYPERV_NET) += hyperv/ | 66 | obj-$(CONFIG_HYPERV_NET) += hyperv/ |
| 74 | obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o | 67 | obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o |
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 7e7269fd3707..9f194a0bef7c 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
| @@ -1,12 +1,16 @@ | |||
| 1 | # | 1 | # |
| 2 | # USB Network devices configuration | 2 | # USB Network devices configuration |
| 3 | # | 3 | # |
| 4 | comment "Networking support is needed for USB Network Adapter support" | 4 | comment "Host-side USB support is needed for USB Network Adapter support" |
| 5 | depends on USB && !NET | 5 | depends on !USB && NET |
| 6 | 6 | ||
| 7 | menu "USB Network Adapters" | 7 | menuconfig USB_NET_DRIVERS |
| 8 | bool "USB Network Adapters" | ||
| 9 | default y | ||
| 8 | depends on USB && NET | 10 | depends on USB && NET |
| 9 | 11 | ||
| 12 | if USB_NET_DRIVERS | ||
| 13 | |||
| 10 | config USB_CATC | 14 | config USB_CATC |
| 11 | tristate "USB CATC NetMate-based Ethernet device support" | 15 | tristate "USB CATC NetMate-based Ethernet device support" |
| 12 | select CRC32 | 16 | select CRC32 |
| @@ -568,5 +572,4 @@ config USB_VL600 | |||
| 568 | 572 | ||
| 569 | http://ubuntuforums.org/showpost.php?p=10589647&postcount=17 | 573 | http://ubuntuforums.org/showpost.php?p=10589647&postcount=17 |
| 570 | 574 | ||
| 571 | 575 | endif # USB_NET_DRIVERS | |
| 572 | endmenu | ||
