Merge branch 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Move USB network drivers to drivers/net/usb.

Merge branch 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: Move USB network drivers to drivers/net/usb.
b5f0adbc · Linus Torvalds · 0a09d9a4 · 5b2fc499 · b5f0adbc · b5f0adbc
Commit b5f0adbc authored 18 years ago by Linus Torvalds
--- 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"

--- 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/

--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
--- a/drivers/usb/net/cdc_ether.c
+++ b/drivers/usb/net/cdc_ether.c
--- a/drivers/usb/net/cdc_subset.c
+++ b/drivers/usb/net/cdc_subset.c
--- a/drivers/usb/net/dm9601.c
+++ b/drivers/usb/net/dm9601.c
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/usb/net/gl620a.c
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
--- a/drivers/usb/net/kawethfw.h
+++ b/drivers/usb/net/kawethfw.h
--- a/drivers/usb/net/mcs7830.c
+++ b/drivers/usb/net/mcs7830.c
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
--- a/drivers/usb/net/pegasus.h
+++ b/drivers/usb/net/pegasus.h
--- a/drivers/usb/net/plusb.c
+++ b/drivers/usb/net/plusb.c
--- a/drivers/usb/net/rndis_host.c
+++ b/drivers/usb/net/rndis_host.c
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c