diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-02 11:44:51 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-02 11:44:51 +0200 |
| commit | ea019fdf1a2aa4134ce90801f7b36680d0fbd785 (patch) | |
| tree | ab44af35ae3e75f7fe60391274aa8a0a09a15c15 /drivers/usb/gadget/Makefile | |
| parent | 55a63d4da3b8850480a1c5b222f77c739e30e346 (diff) | |
| parent | 40bac28eb1e39f229a94ad72e2ca8cdeef3ba31a (diff) | |
| download | linux-ea019fdf1a2aa4134ce90801f7b36680d0fbd785.tar.bz2 | |
Merge tag 'asoc-fix-v3.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.9
A few more fixes here and there, including quite a few nasty driver
specific ones, but nothing that has a major general impact.
Diffstat (limited to 'drivers/usb/gadget/Makefile')
| -rw-r--r-- | drivers/usb/gadget/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 97a13c349cc5..82fb22511356 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -35,6 +35,12 @@ mv_udc-y := mv_udc_core.o obj-$(CONFIG_USB_FUSB300) += fusb300_udc.o obj-$(CONFIG_USB_MV_U3D) += mv_u3d_core.o +# USB Functions +obj-$(CONFIG_USB_F_ACM) += f_acm.o +f_ss_lb-y := f_loopback.o f_sourcesink.o +obj-$(CONFIG_USB_F_SS_LB) += f_ss_lb.o +obj-$(CONFIG_USB_U_SERIAL) += u_serial.o + # # USB gadget drivers # @@ -74,9 +80,3 @@ obj-$(CONFIG_USB_G_WEBCAM) += g_webcam.o obj-$(CONFIG_USB_G_NCM) += g_ncm.o obj-$(CONFIG_USB_G_ACM_MS) += g_acm_ms.o obj-$(CONFIG_USB_GADGET_TARGET) += tcm_usb_gadget.o - -# USB Functions -obj-$(CONFIG_USB_F_ACM) += f_acm.o -f_ss_lb-y := f_loopback.o f_sourcesink.o -obj-$(CONFIG_USB_F_SS_LB) += f_ss_lb.o -obj-$(CONFIG_USB_U_SERIAL) += u_serial.o |