Merge tag 'tegra-for-5.2-arm64-soc-fixes' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-block.git] / drivers / media / Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 985d35ec6b298491eb80bd7c3b246faba58d0dd7..4a330d0e5e40002d60c480006b757aef3f49fbc7 100644 (file)
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -6,6 +6,12 @@
 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