X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fmedia%2FMakefile;h=8b8ae168d80bb691611d3a1b5ebd2b7d7db56228;hb=72f7047efc58ff4318373852890bb35e8d80ba8e;hp=6b9d6e1576b34f08d5a795e5b895be3bc29e8786;hpb=3ca9efa2f84503d67046ce2583470618b0faba24;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 6b9d6e1576b3..8b8ae168d80b 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -18,8 +18,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
   obj-$(CONFIG_MEDIA_SUPPORT) += media.o
 endif
 
-#obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
-obj-y += v4l2-core/
+obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
 obj-$(CONFIG_DVB_CORE)  += dvb-core/
 
 # There are both core and drivers at RC subtree - merge before drivers
@@ -29,8 +28,8 @@ obj-y += rc/
 # Finally, merge the drivers that require the core
 #
 
-obj-y += common/ platform/ pci/ usb/ mmc/ firewire/ parport/
+obj-y += common/ platform/ pci/ usb/ mmc/ firewire/
 obj-$(CONFIG_VIDEO_DEV) += radio/
-obj-y += video/rk_camsys/
-obj-y += video/
-obj-y += platform/
+obj-$(CONFIG_CAMSYS_DRV) += video/rk_camsys/
+obj-$(CONFIG_ROCK_CHIP_SOC_CAMERA) += video/
+