diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-05-10 01:31:55 (GMT) |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-05-10 01:31:55 (GMT) |
commit | 5b2fc499917e5897a13add780e181b4cef197072 (patch) | |
tree | 1a1ba52c0c2a7ce9843875cdd713d75d37c4ea1b /drivers | |
parent | 3cb7396b7b26585b1ab7c1a8ca554ec103da5d37 (diff) | |
download | linux-5b2fc499917e5897a13add780e181b4cef197072.tar.xz |
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 <gregkh@suse.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/Makefile | 8 | ||||
-rw-r--r-- | drivers/net/usb/Kconfig (renamed from drivers/usb/net/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/net/usb/Makefile (renamed from drivers/usb/net/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/usb/asix.c (renamed from drivers/usb/net/asix.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/catc.c (renamed from drivers/usb/net/catc.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/cdc_ether.c (renamed from drivers/usb/net/cdc_ether.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/cdc_subset.c (renamed from drivers/usb/net/cdc_subset.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/dm9601.c (renamed from drivers/usb/net/dm9601.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/gl620a.c (renamed from drivers/usb/net/gl620a.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/kaweth.c (renamed from drivers/usb/net/kaweth.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/kawethfw.h (renamed from drivers/usb/net/kawethfw.h) | 0 | ||||
-rw-r--r-- | drivers/net/usb/mcs7830.c (renamed from drivers/usb/net/mcs7830.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/net1080.c (renamed from drivers/usb/net/net1080.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.c (renamed from drivers/usb/net/pegasus.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/pegasus.h (renamed from drivers/usb/net/pegasus.h) | 0 | ||||
-rw-r--r-- | drivers/net/usb/plusb.c (renamed from drivers/usb/net/plusb.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/rndis_host.c (renamed from drivers/usb/net/rndis_host.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/rtl8150.c (renamed from drivers/usb/net/rtl8150.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c (renamed from drivers/usb/net/usbnet.c) | 0 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.h (renamed from drivers/usb/net/usbnet.h) | 0 | ||||
-rw-r--r-- | drivers/net/usb/zaurus.c (renamed from drivers/usb/net/zaurus.c) | 0 | ||||
-rw-r--r-- | drivers/usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/Makefile | 7 |
24 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b86ccd2..d9842d8 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 59c0459..c5d8423 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 index 3de564b..3de564b 100644 --- a/drivers/usb/net/Kconfig +++ b/drivers/net/usb/Kconfig diff --git a/drivers/usb/net/Makefile b/drivers/net/usb/Makefile index 595a539..595a539 100644 --- a/drivers/usb/net/Makefile +++ b/drivers/net/usb/Makefile diff --git a/drivers/usb/net/asix.c b/drivers/net/usb/asix.c index d5ef97b..d5ef97b 100644 --- a/drivers/usb/net/asix.c +++ b/drivers/net/usb/asix.c diff --git a/drivers/usb/net/catc.c b/drivers/net/usb/catc.c index 86e90c5..86e90c5 100644 --- a/drivers/usb/net/catc.c +++ b/drivers/net/usb/catc.c diff --git a/drivers/usb/net/cdc_ether.c b/drivers/net/usb/cdc_ether.c index 5a21f06..5a21f06 100644 --- a/drivers/usb/net/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c diff --git a/drivers/usb/net/cdc_subset.c b/drivers/net/usb/cdc_subset.c index bc62b01..bc62b01 100644 --- a/drivers/usb/net/cdc_subset.c +++ b/drivers/net/usb/cdc_subset.c diff --git a/drivers/usb/net/dm9601.c b/drivers/net/usb/dm9601.c index a676386..a676386 100644 --- a/drivers/usb/net/dm9601.c +++ b/drivers/net/usb/dm9601.c diff --git a/drivers/usb/net/gl620a.c b/drivers/net/usb/gl620a.c index 031cf5c..031cf5c 100644 --- a/drivers/usb/net/gl620a.c +++ b/drivers/net/usb/gl620a.c diff --git a/drivers/usb/net/kaweth.c b/drivers/net/usb/kaweth.c index 60d2944..60d2944 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/net/usb/kaweth.c diff --git a/drivers/usb/net/kawethfw.h b/drivers/net/usb/kawethfw.h index cf85fcb..cf85fcb 100644 --- a/drivers/usb/net/kawethfw.h +++ b/drivers/net/usb/kawethfw.h diff --git a/drivers/usb/net/mcs7830.c b/drivers/net/usb/mcs7830.c index 6240b97..6240b97 100644 --- a/drivers/usb/net/mcs7830.c +++ b/drivers/net/usb/mcs7830.c diff --git a/drivers/usb/net/net1080.c b/drivers/net/usb/net1080.c index 19bf8da..19bf8da 100644 --- a/drivers/usb/net/net1080.c +++ b/drivers/net/usb/net1080.c diff --git a/drivers/usb/net/pegasus.c b/drivers/net/usb/pegasus.c index a05fd97..a05fd97 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/net/usb/pegasus.c diff --git a/drivers/usb/net/pegasus.h b/drivers/net/usb/pegasus.h index c746782..c746782 100644 --- a/drivers/usb/net/pegasus.h +++ b/drivers/net/usb/pegasus.h diff --git a/drivers/usb/net/plusb.c b/drivers/net/usb/plusb.c index 4530093..4530093 100644 --- a/drivers/usb/net/plusb.c +++ b/drivers/net/usb/plusb.c diff --git a/drivers/usb/net/rndis_host.c b/drivers/net/usb/rndis_host.c index 980e4aa..980e4aa 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/net/usb/rndis_host.c diff --git a/drivers/usb/net/rtl8150.c b/drivers/net/usb/rtl8150.c index fa598f0..fa598f0 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/net/usb/rtl8150.c diff --git a/drivers/usb/net/usbnet.c b/drivers/net/usb/usbnet.c index f9cd42d..f9cd42d 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/net/usb/usbnet.c diff --git a/drivers/usb/net/usbnet.h b/drivers/net/usb/usbnet.h index 82db5a8..82db5a8 100644 --- a/drivers/usb/net/usbnet.h +++ b/drivers/net/usb/usbnet.h diff --git a/drivers/usb/net/zaurus.c b/drivers/net/usb/zaurus.c index 9f98e8c..9f98e8c 100644 --- a/drivers/usb/net/zaurus.c +++ b/drivers/net/usb/zaurus.c diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index b847bbc..278a22c 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 0ef090b..72464b5 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/ |