diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:59:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 11:59:29 +0200 |
| commit | 5e8aa85253513b9c1ade8bd71dc341218a752a65 (patch) | |
| tree | 84240b7f72fefb805c78300de0ae23b7b96bf5c2 /sound/usb/Makefile | |
| parent | 7bd9db83087aecef8279c0b8b9dfef4db4a8fc3c (diff) | |
| parent | 550a8b691ca67761bbf382d98fbd81d215f1d7f0 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/Makefile')
| -rw-r--r-- | sound/usb/Makefile | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index 5bf64aef9558..e7ac7f493a8f 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -2,14 +2,24 @@ # Makefile for ALSA # -snd-usb-audio-objs := usbaudio.o usbmixer.o -snd-usb-lib-objs := usbmidi.o -snd-ua101-objs := ua101.o +snd-usb-audio-objs := card.o \ + mixer.o \ + mixer_quirks.o \ + proc.o \ + quirks.o \ + format.o \ + endpoint.o \ + urb.o \ + pcm.o \ + helper.o + +snd-usbmidi-lib-objs := midi.o # Toplevel Module Dependency -obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usb-lib.o -obj-$(CONFIG_SND_USB_UA101) += snd-ua101.o snd-usb-lib.o -obj-$(CONFIG_SND_USB_USX2Y) += snd-usb-lib.o -obj-$(CONFIG_SND_USB_US122L) += snd-usb-lib.o +obj-$(CONFIG_SND_USB_AUDIO) += snd-usb-audio.o snd-usbmidi-lib.o + +obj-$(CONFIG_SND_USB_UA101) += snd-usbmidi-lib.o +obj-$(CONFIG_SND_USB_USX2Y) += snd-usbmidi-lib.o +obj-$(CONFIG_SND_USB_US122L) += snd-usbmidi-lib.o -obj-$(CONFIG_SND) += usx2y/ caiaq/ +obj-$(CONFIG_SND) += misc/ usx2y/ caiaq/ |