diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-02-15 15:11:31 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:41 -0800 |
commit | 97b00233032b0d5204770ceb4411571425b57bfd (patch) | |
tree | 2a7e5feef3691ca155f81c6a2bd89d8aeb9a3528 /drivers/media | |
parent | 245a922f7c3180c0636b2bf98fccbb77be455473 (diff) |
resolve merge: drivers/media/video/tegra/Makefile
Rebase-Id: R093dc181bed1f6cebc8f97893ef0962c06a08bcd
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/tegra/Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/media/video/tegra/Makefile b/drivers/media/video/tegra/Makefile index 516fd7e0445a..872a3ce0d30a 100644 --- a/drivers/media/video/tegra/Makefile +++ b/drivers/media/video/tegra/Makefile @@ -1,10 +1,14 @@ +# +# Makefile for the video capture/playback device drivers. +# obj-y += avp/ -obj-$(CONFIG_TEGRA_MEDIASERVER) += mediaserver/ -obj-$(CONFIG_TEGRA_CAMERA) += tegra_camera.o -obj-$(CONFIG_VIDEO_OV5650) += ov5650.o -obj-$(CONFIG_VIDEO_OV2710) += ov2710.o -obj-$(CONFIG_VIDEO_SOC380) += soc380.o -obj-$(CONFIG_TORCH_SSL3250A) += ssl3250a.o -obj-$(CONFIG_VIDEO_SH532U) += sh532u.o -obj-$(CONFIG_VIDEO_AD5820) += ad5820.o +obj-$(CONFIG_TEGRA_MEDIASERVER) += mediaserver/ +obj-$(CONFIG_TEGRA_CAMERA) += tegra_camera.o +obj-$(CONFIG_VIDEO_OV5650) += ov5650.o +obj-$(CONFIG_VIDEO_OV2710) += ov2710.o +obj-$(CONFIG_VIDEO_SOC380) += soc380.o +obj-$(CONFIG_TORCH_SSL3250A) += ssl3250a.o +obj-$(CONFIG_VIDEO_SH532U) += sh532u.o +obj-$(CONFIG_VIDEO_AD5820) += ad5820.o + |