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.
2026-09-26 18:16:26 +00:00 · 2007-05-09 18:53:12 -07:00 · 2007-05-09 18:53:12 -07:00 · b5f0adbcc4
commit b5f0adbcc4
parent 0a09d9a49c 5b2fc49991
44 changed files with 13226 additions and 13225 deletions
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
--- a/drivers/net/usb/gl620a.c
+++ b/drivers/net/usb/gl620a.c
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
--- a/drivers/net/usb/kawethfw.h
+++ b/drivers/net/usb/kawethfw.h
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
--- a/drivers/net/usb/net1080.c
+++ b/drivers/net/usb/net1080.c
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
--- a/drivers/net/usb/pegasus.h
+++ b/drivers/net/usb/pegasus.h
--- a/drivers/net/usb/plusb.c
+++ b/drivers/net/usb/plusb.c
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
--- a/drivers/net/usb/usbnet.h
+++ b/drivers/net/usb/usbnet.h
--- a/drivers/net/usb/zaurus.c
+++ b/drivers/net/usb/zaurus.c
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile