summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-23 16:11:54 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-23 16:11:54 -0300
commit8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf (patch)
tree472c338929bdcb87f76a7824bf1602378ab34d03 /linux/drivers/media/video/Makefile
parent27db32c1fbbd03a1427f7b783dcc7eee372c953e (diff)
parent47e7619ed0e11061799a387d580aa2aa90561ead (diff)
downloadmediapointer-dvb-s2-8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf.tar.gz
mediapointer-dvb-s2-8587142fb31bbbc156e4e1ecd758e2c0fe5eb2bf.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/mpeg-api
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/Makefile')
-rw-r--r--linux/drivers/media/video/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index 44f84166f..572e84835 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -74,6 +74,7 @@ obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
+obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
obj-$(CONFIG_USB_DABUSB) += dabusb.o
obj-$(CONFIG_USB_DSBR) += dsbr100.o