Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / sound / usb / Makefile

diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 0758d8dc8cdee67f3e9eb9bbd4d6cef138ed6730..e7ac7f493a8fa1d0874ca9992ee180679390ec69 100644 (file)
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -3,7 +3,8 @@
 #
 
 snd-usb-audio-objs :=  card.o \
-                       usbmixer.o \
+                       mixer.o \
+                       mixer_quirks.o \
                        proc.o \
                        quirks.o \
                        format.o \