Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

[linux-2.6-block.git] / sound / usb / Makefile

diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 8dca3c407f5a77446c1f7ea8d36db4e207bf112c..2d2d122b069f37974b7353d781023cf99cbe11ef 100644 (file)
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -15,8 +15,6 @@ snd-usb-audio-objs :=         card.o \
                        quirks.o \
                        stream.o
 
-snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o
-
 snd-usbmidi-lib-objs := midi.o
 
 # Toplevel Module Dependency