summaryrefslogtreecommitdiff
path: root/drivers/net/usb/Makefile
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-03 04:43:40 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-05-03 05:02:06 (GMT)
commit7ef527377b88ff05fb122a47619ea506c631c914 (patch)
tree2c2e774527d5f591b975834f43e8c6fd12fb38f2 /drivers/net/usb/Makefile
parent47d29646a2c1c147d8a7598aeac2c87dd71ed638 (diff)
parent1183f3838c588545592c042c0ce15015661ce7f2 (diff)
downloadlinux-7ef527377b88ff05fb122a47619ea506c631c914.tar.xz
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/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile
index edb09c0..b13a279 100644
--- a/drivers/net/usb/Makefile
+++ b/drivers/net/usb/Makefile
@@ -24,4 +24,5 @@ obj-$(CONFIG_USB_USBNET) += usbnet.o
obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o
obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o
obj-$(CONFIG_USB_IPHETH) += ipheth.o
+obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o