Merge tag 'gvt-next-fixes-2019-09-06' of https://github.com/intel/gvt-linux into...

[linux.git] / drivers / media / Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 4a330d0e5e40002d60c480006b757aef3f49fbc7..f215f0a89f9e648eddde7f2d58fe2a2a58dee62f 100644 (file)
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -3,15 +3,6 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
-media-objs     := media-device.o media-devnode.o media-entity.o \
-                  media-request.o
-
-ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
-       ifeq ($(CONFIG_USB),y)
-               media-objs += media-dev-allocator.o
-       endif
-endif
-
 #
 # I2C drivers should come before other drivers, otherwise they'll fail
 # when compiled as builtin drivers
@@ -20,10 +11,10 @@ obj-y += i2c/ tuners/
 obj-$(CONFIG_DVB_CORE)  += dvb-frontends/
 
 #
-# Now, let's link-in the media core
+# Now, let's link-in the media controller core
 #
 ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
-  obj-$(CONFIG_MEDIA_SUPPORT) += media.o
+  obj-$(CONFIG_MEDIA_SUPPORT) += mc/
 endif
 
 obj-$(CONFIG_VIDEO_DEV) += v4l2-core/