diff --git a/[refs] b/[refs] index 5bd412069962..b48dfe31a1e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4c723e6101b66d35129359fc448e0e98d7e2e28 +refs/heads/master: a47b6118e134b51562de520d644d3979b3d99e44 diff --git a/trunk/drivers/media/platform/Makefile b/trunk/drivers/media/platform/Makefile index 4afb1af233e6..92127773237c 100644 --- a/trunk/drivers/media/platform/Makefile +++ b/trunk/drivers/media/platform/Makefile @@ -40,6 +40,8 @@ obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o +obj-$(CONFIG_SOC_CAMERA) += soc_camera/ + obj-y += davinci/ obj-$(CONFIG_ARCH_OMAP) += omap/