diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-31 06:37:29 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-31 06:37:29 +0200 |
commit | 4e700bcdd89a5592a5a991bf3e78904de1140611 (patch) | |
tree | 1a21ea2eb4c0ebe1a9d5303c6cc8328474f7f5e1 /drivers/net/usb/Makefile | |
parent | Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | sctp: Pass __GFP_NOWARN to hash table allocation attempts. (diff) | |
download | linux-4e700bcdd89a5592a5a991bf3e78904de1140611.tar.xz linux-4e700bcdd89a5592a5a991bf3e78904de1140611.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/usb/Makefile')
-rw-r--r-- | drivers/net/usb/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index cac170301187..c7ec8a5f0a90 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -27,4 +27,5 @@ obj-$(CONFIG_USB_IPHETH) += ipheth.o obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o obj-$(CONFIG_USB_NET_CX82310_ETH) += cx82310_eth.o obj-$(CONFIG_USB_NET_CDC_NCM) += cdc_ncm.o +obj-$(CONFIG_USB_VL600) += lg-vl600.o |