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.
This commit is contained in:
commit
b5f0adbcc4
|
@ -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"
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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/
|
||||
|
||||
|
|
Loading…
Reference in New Issue