summaryrefslogtreecommitdiffstats
path: root/sound/usb/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-31 09:57:29 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-31 15:02:33 -0300
commitc89178f57a19300b2056f58167e183e966a4836d (patch)
tree5ba4770b2377124e1d905a9e4f91d75dc9bb7365 /sound/usb/Makefile
parente8e3039f5b941f7825d335f8ca11c12a8104db11 (diff)
downloadlinux-c89178f57a19300b2056f58167e183e966a4836d.tar.bz2
[media] Revert "[media] sound/usb: Use Media Controller API to share media resources"
Unfortunately, this patch caused several regressions at au0828 and snd-usb-audio, like this one: https://bugzilla.kernel.org/show_bug.cgi?id=115561 It also showed several troubles at the MC core that handles pretty poorly the memory protections and data lifetime management. So, better to revert it and fix the core before reapplying this change. This reverts commit aebb2b89bff0 ("[media] sound/usb: Use Media Controller API to share media resources")' Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'sound/usb/Makefile')
-rw-r--r--sound/usb/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 8dca3c407f5a..2d2d122b069f 100644
--- 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