summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-12-14 02:18:12 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-14 02:18:12 -0200
commit50a5defff418272f0934301f540160d172b46c36 (patch)
tree8cc091512468462aa4ec6dd8db0eff5d1fe7c480 /linux/drivers/media/video/Makefile
parent427b70d46df23ba54523af265fd2bc28d061e435 (diff)
parentaf2c8347ec518cf5ff646d2bf560206780775795 (diff)
downloadmediapointer-dvb-s2-50a5defff418272f0934301f540160d172b46c36.tar.gz
mediapointer-dvb-s2-50a5defff418272f0934301f540160d172b46c36.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-ng
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/Makefile')
-rw-r--r--linux/drivers/media/video/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index d16356ebe..84a2be0cb 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -8,6 +8,8 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o
stkwebcam-objs := stk-webcam.o stk-sensor.o
+omap2cam-objs := omap24xxcam.o omap24xxcam-dma.o
+
videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-subdev.o
obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-compat-ioctl32.o v4l2-int-device.o
@@ -67,6 +69,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
obj-$(CONFIG_VIDEO_TVP5150) += tvp5150.o
+obj-$(CONFIG_VIDEO_TVP514X) += tvp514x.o
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
obj-$(CONFIG_VIDEO_CS5345) += cs5345.o
@@ -130,6 +133,7 @@ obj-$(CONFIG_VIDEO_CX23885) += cx23885/
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_MT9M001) += mt9m001.o
obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o