diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 23:55:35 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-13 23:55:53 +0400 |
| commit | 2290c0d06d82faee87b1ab2d9d4f7bf81ef64379 (patch) | |
| tree | e075e4d5534193f28e6059904f61e5ca03958d3c /sound/usb/Makefile | |
| parent | 4da669a2e3e5bc70b30a0465f3641528681b5f77 (diff) | |
| parent | 52e4c2a05256cb83cda12f3c2137ab1533344edb (diff) | |
| download | linux-2290c0d06d82faee87b1ab2d9d4f7bf81ef64379.tar.xz | |
Merge branch 'master' into for-next
Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
Diffstat (limited to 'sound/usb/Makefile')
| -rw-r--r-- | sound/usb/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile index cf9ed66445fa..ac256dc4c6be 100644 --- a/sound/usb/Makefile +++ b/sound/usb/Makefile @@ -3,16 +3,16 @@ # snd-usb-audio-objs := card.o \ + clock.o \ + endpoint.o \ + format.o \ + helper.o \ mixer.o \ mixer_quirks.o \ + pcm.o \ proc.o \ quirks.o \ - format.o \ - endpoint.o \ - urb.o \ - pcm.o \ - helper.o \ - clock.o + stream.o snd-usbmidi-lib-objs := midi.o |