leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 'usb-move' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  Move USB network drivers to drivers/net/usb.
This commit is contained in:
Linus Torvalds 2007-05-09 18:53:12 -07:00
commit b5f0adbcc4
24 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/Kconfig
View File

@ -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"

8
drivers/net/Makefile
View File

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

0
drivers/usb/net/Kconfig → drivers/net/usb/Kconfig
View File

0
drivers/usb/net/Makefile → drivers/net/usb/Makefile
View File

0
drivers/usb/net/asix.c → drivers/net/usb/asix.c
View File

0
drivers/usb/net/catc.c → drivers/net/usb/catc.c
View File

0
drivers/usb/net/cdc_ether.c → drivers/net/usb/cdc_ether.c
View File

0
drivers/usb/net/cdc_subset.c → drivers/net/usb/cdc_subset.c
View File

0
drivers/usb/net/dm9601.c → drivers/net/usb/dm9601.c
View File

0
drivers/usb/net/gl620a.c → drivers/net/usb/gl620a.c
View File

0
drivers/usb/net/kaweth.c → drivers/net/usb/kaweth.c
View File

0
drivers/usb/net/kawethfw.h → drivers/net/usb/kawethfw.h
View File

0
drivers/usb/net/mcs7830.c → drivers/net/usb/mcs7830.c
View File

0
drivers/usb/net/net1080.c → drivers/net/usb/net1080.c
View File

0
drivers/usb/net/pegasus.c → drivers/net/usb/pegasus.c
View File

0
drivers/usb/net/pegasus.h → drivers/net/usb/pegasus.h
View File

0
drivers/usb/net/plusb.c → drivers/net/usb/plusb.c
View File

0
drivers/usb/net/rndis_host.c → drivers/net/usb/rndis_host.c
View File

0
drivers/usb/net/rtl8150.c → drivers/net/usb/rtl8150.c
View File

0
drivers/usb/net/usbnet.c → drivers/net/usb/usbnet.c
View File

0
drivers/usb/net/usbnet.h → drivers/net/usb/usbnet.h
View File

0
drivers/usb/net/zaurus.c → drivers/net/usb/zaurus.c
View File

2
drivers/usb/Kconfig
View File

@ -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"

7
drivers/usb/Makefile
View File

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