From 5b2fc499917e5897a13add780e181b4cef197072 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 9 May 2007 21:31:55 -0400 Subject: [PATCH] Move USB network drivers to drivers/net/usb. It is preferable to group drivers by usage (net, scsi, ATA, ...) than by bus. When reviewing drivers, the [PCI|USB|PCMCIA|...] maintainer is probably less qualified on networking issues than a networking maintainer. Also, from a practical standpoint, chips often appear on multiple buses, which is why we do not put drivers into drivers/pci/net. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Jeff Garzik --- drivers/net/Kconfig | 2 ++ drivers/net/Makefile | 8 ++++++++ drivers/{usb/net => net/usb}/Kconfig | 0 drivers/{usb/net => net/usb}/Makefile | 0 drivers/{usb/net => net/usb}/asix.c | 0 drivers/{usb/net => net/usb}/catc.c | 0 drivers/{usb/net => net/usb}/cdc_ether.c | 0 drivers/{usb/net => net/usb}/cdc_subset.c | 0 drivers/{usb/net => net/usb}/dm9601.c | 0 drivers/{usb/net => net/usb}/gl620a.c | 0 drivers/{usb/net => net/usb}/kaweth.c | 0 drivers/{usb/net => net/usb}/kawethfw.h | 0 drivers/{usb/net => net/usb}/mcs7830.c | 0 drivers/{usb/net => net/usb}/net1080.c | 0 drivers/{usb/net => net/usb}/pegasus.c | 0 drivers/{usb/net => net/usb}/pegasus.h | 0 drivers/{usb/net => net/usb}/plusb.c | 0 drivers/{usb/net => net/usb}/rndis_host.c | 0 drivers/{usb/net => net/usb}/rtl8150.c | 0 drivers/{usb/net => net/usb}/usbnet.c | 0 drivers/{usb/net => net/usb}/usbnet.h | 0 drivers/{usb/net => net/usb}/zaurus.c | 0 drivers/usb/Kconfig | 2 -- drivers/usb/Makefile | 7 ------- 24 files changed, 10 insertions(+), 9 deletions(-) rename drivers/{usb/net => net/usb}/Kconfig (100%) rename drivers/{usb/net => net/usb}/Makefile (100%) rename drivers/{usb/net => net/usb}/asix.c (100%) rename drivers/{usb/net => net/usb}/catc.c (100%) rename drivers/{usb/net => net/usb}/cdc_ether.c (100%) rename drivers/{usb/net => net/usb}/cdc_subset.c (100%) rename drivers/{usb/net => net/usb}/dm9601.c (100%) rename drivers/{usb/net => net/usb}/gl620a.c (100%) rename drivers/{usb/net => net/usb}/kaweth.c (100%) rename drivers/{usb/net => net/usb}/kawethfw.h (100%) rename drivers/{usb/net => net/usb}/mcs7830.c (100%) rename drivers/{usb/net => net/usb}/net1080.c (100%) rename drivers/{usb/net => net/usb}/pegasus.c (100%) rename drivers/{usb/net => net/usb}/pegasus.h (100%) rename drivers/{usb/net => net/usb}/plusb.c (100%) rename drivers/{usb/net => net/usb}/rndis_host.c (100%) rename drivers/{usb/net => net/usb}/rtl8150.c (100%) rename drivers/{usb/net => net/usb}/usbnet.c (100%) rename drivers/{usb/net => net/usb}/usbnet.h (100%) rename drivers/{usb/net => net/usb}/zaurus.c (100%) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b86ccd2ecd5b..d9842d8544dc 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2499,6 +2499,8 @@ source "drivers/net/tokenring/Kconfig" source "drivers/net/wireless/Kconfig" +source "drivers/net/usb/Kconfig" + source "drivers/net/pcmcia/Kconfig" source "drivers/net/wan/Kconfig" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 59c0459a037c..c5d8423573b6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -206,6 +206,14 @@ obj-$(CONFIG_TR) += tokenring/ obj-$(CONFIG_WAN) += wan/ obj-$(CONFIG_ARCNET) += arcnet/ obj-$(CONFIG_NET_PCMCIA) += pcmcia/ + +obj-$(CONFIG_USB_CATC) += usb/ +obj-$(CONFIG_USB_KAWETH) += usb/ +obj-$(CONFIG_USB_PEGASUS) += usb/ +obj-$(CONFIG_USB_RTL8150) += usb/ +obj-$(CONFIG_USB_USBNET) += usb/ +obj-$(CONFIG_USB_ZD1201) += usb/ + obj-y += wireless/ obj-$(CONFIG_NET_TULIP) += tulip/ obj-$(CONFIG_HAMRADIO) += hamradio/ diff --git a/drivers/usb/net/Kconfig b/drivers/net/usb/Kconfig similarity index 100% rename from drivers/usb/net/Kconfig rename to drivers/net/usb/Kconfig diff --git a/drivers/usb/net/Makefile b/drivers/net/usb/Makefile similarity index 100% rename from drivers/usb/net/Makefile rename to drivers/net/usb/Makefile diff --git a/drivers/usb/net/asix.c b/drivers/net/usb/asix.c similarity index 100% rename from drivers/usb/net/asix.c rename to drivers/net/usb/asix.c diff --git a/drivers/usb/net/catc.c b/drivers/net/usb/catc.c similarity index 100% rename from drivers/usb/net/catc.c rename to drivers/net/usb/catc.c diff --git a/drivers/usb/net/cdc_ether.c b/drivers/net/usb/cdc_ether.c similarity index 100% rename from drivers/usb/net/cdc_ether.c rename to drivers/net/usb/cdc_ether.c diff --git a/drivers/usb/net/cdc_subset.c b/drivers/net/usb/cdc_subset.c similarity index 100% rename from drivers/usb/net/cdc_subset.c rename to drivers/net/usb/cdc_subset.c diff --git a/drivers/usb/net/dm9601.c b/drivers/net/usb/dm9601.c similarity index 100% rename from drivers/usb/net/dm9601.c rename to drivers/net/usb/dm9601.c diff --git a/drivers/usb/net/gl620a.c b/drivers/net/usb/gl620a.c similarity index 100% rename from drivers/usb/net/gl620a.c rename to drivers/net/usb/gl620a.c diff --git a/drivers/usb/net/kaweth.c b/drivers/net/usb/kaweth.c similarity index 100% rename from drivers/usb/net/kaweth.c rename to drivers/net/usb/kaweth.c diff --git a/drivers/usb/net/kawethfw.h b/drivers/net/usb/kawethfw.h similarity index 100% rename from drivers/usb/net/kawethfw.h rename to drivers/net/usb/kawethfw.h diff --git a/drivers/usb/net/mcs7830.c b/drivers/net/usb/mcs7830.c similarity index 100% rename from drivers/usb/net/mcs7830.c rename to drivers/net/usb/mcs7830.c diff --git a/drivers/usb/net/net1080.c b/drivers/net/usb/net1080.c similarity index 100% rename from drivers/usb/net/net1080.c rename to drivers/net/usb/net1080.c diff --git a/drivers/usb/net/pegasus.c b/drivers/net/usb/pegasus.c similarity index 100% rename from drivers/usb/net/pegasus.c rename to drivers/net/usb/pegasus.c diff --git a/drivers/usb/net/pegasus.h b/drivers/net/usb/pegasus.h similarity index 100% rename from drivers/usb/net/pegasus.h rename to drivers/net/usb/pegasus.h diff --git a/drivers/usb/net/plusb.c b/drivers/net/usb/plusb.c similarity index 100% rename from drivers/usb/net/plusb.c rename to drivers/net/usb/plusb.c diff --git a/drivers/usb/net/rndis_host.c b/drivers/net/usb/rndis_host.c similarity index 100% rename from drivers/usb/net/rndis_host.c rename to drivers/net/usb/rndis_host.c diff --git a/drivers/usb/net/rtl8150.c b/drivers/net/usb/rtl8150.c similarity index 100% rename from drivers/usb/net/rtl8150.c rename to drivers/net/usb/rtl8150.c diff --git a/drivers/usb/net/usbnet.c b/drivers/net/usb/usbnet.c similarity index 100% rename from drivers/usb/net/usbnet.c rename to drivers/net/usb/usbnet.c diff --git a/drivers/usb/net/usbnet.h b/drivers/net/usb/usbnet.h similarity index 100% rename from drivers/usb/net/usbnet.h rename to drivers/net/usb/usbnet.h diff --git a/drivers/usb/net/zaurus.c b/drivers/net/usb/zaurus.c similarity index 100% rename from drivers/usb/net/zaurus.c rename to drivers/net/usb/zaurus.c diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index b847bbc8b0e1..278a22cea5bf 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -87,8 +87,6 @@ source "drivers/usb/storage/Kconfig" source "drivers/usb/image/Kconfig" -source "drivers/usb/net/Kconfig" - source "drivers/usb/mon/Kconfig" comment "USB port drivers" diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 0ef090b1b37c..72464b586990 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -23,13 +23,6 @@ obj-$(CONFIG_USB_PRINTER) += class/ obj-$(CONFIG_USB_STORAGE) += storage/ obj-$(CONFIG_USB) += storage/ -obj-$(CONFIG_USB_CATC) += net/ -obj-$(CONFIG_USB_KAWETH) += net/ -obj-$(CONFIG_USB_PEGASUS) += net/ -obj-$(CONFIG_USB_RTL8150) += net/ -obj-$(CONFIG_USB_USBNET) += net/ -obj-$(CONFIG_USB_ZD1201) += net/ - obj-$(CONFIG_USB_MDC800) += image/ obj-$(CONFIG_USB_MICROTEK) += image/ -- 2.30.2