diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 12:12:17 +0100 |
commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/net/usb/Makefile | |
parent | ALSA: hda - Avoid codec D3 for keeping mute LED up on Lenovo Yxx0 (diff) | |
parent | ALSA: hda - Add a fixup for HP Folio 13 mute LED (diff) | |
download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.zip |
Merge branch 'for-linus' into HEAD
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 b17b5e88bbaf..433f0a00c683 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o r815x.o obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o obj-$(CONFIG_USB_NET_DM9601) += dm9601.o obj-$(CONFIG_USB_NET_SR9700) += sr9700.o +obj-$(CONFIG_USB_NET_SR9800) += sr9800.o obj-$(CONFIG_USB_NET_SMSC75XX) += smsc75xx.o obj-$(CONFIG_USB_NET_SMSC95XX) += smsc95xx.o obj-$(CONFIG_USB_NET_GL620A) += gl620a.o |