Commit b5f0adbc authored May 09, 2007 by Linus Torvalds

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.

parents 0a09d9a4 5b2fc499

drivers/net/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -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"

drivers/net/Makefile

+8 −0

Original line number	Diff line number	Diff line
		@@ -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/

drivers/usb/net/Kconfig→drivers/net/usb/Kconfig

+0 −0

File moved.

drivers/usb/net/Makefile→drivers/net/usb/Makefile

+0 −0

File moved.

drivers/usb/net/asix.c→drivers/net/usb/asix.c

+0 −0

File moved.