summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-26 21:02:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-26 21:02:33 -0300
commiteb20179da88acc42ffee334ce86bacdf77d4a438 (patch)
tree9f2196b723853e3d581b0b87b3f2ce666fc769be /linux/drivers/media/video/Makefile
parent1e4553680f02af66c3282072f581425637b58f78 (diff)
parent7dab4777ac8eda4056484c99285d58b6b3a91235 (diff)
downloadmediapointer-dvb-s2-eb20179da88acc42ffee334ce86bacdf77d4a438.tar.gz
mediapointer-dvb-s2-eb20179da88acc42ffee334ce86bacdf77d4a438.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-zoran
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/Makefile')
-rw-r--r--linux/drivers/media/video/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 263c2264d..307490ebc 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -132,10 +132,11 @@ obj-$(CONFIG_VIDEO_CX18) += cx18/
obj-$(CONFIG_VIDEO_VIVI) += vivi.o
obj-$(CONFIG_VIDEO_CX23885) += cx23885/
-obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
+obj-$(CONFIG_VIDEO_MX3) += mx3_camera.o
+obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o
obj-$(CONFIG_VIDEO_OMAP2) += omap2cam.o
-obj-$(CONFIG_SOC_CAMERA) += soc_camera.o
+obj-$(CONFIG_SOC_CAMERA) += soc_camera.o
obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o
obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o