diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-28 08:03:23 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-11-28 08:03:23 -0200 |
| commit | 05222402b72fa35a14adb35db4e51e55d3b72f2f (patch) | |
| tree | ce5a78e12fb23de330787a3d4d440433af1f6f78 /linux/drivers/media/video/Makefile | |
| parent | 87fc384f35e1ee563498df696b57b908a215a499 (diff) | |
| parent | 080a587ad1c509488047ab48c14f424b3e3c2cd9 (diff) | |
| download | mediapointer-dvb-s2-05222402b72fa35a14adb35db4e51e55d3b72f2f.tar.gz mediapointer-dvb-s2-05222402b72fa35a14adb35db4e51e55d3b72f2f.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/lgdt330x
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/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index af57abce8..20b9cbc14 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/drivers/media/video/Makefile @@ -2,7 +2,6 @@ # Makefile for the video capture/playback device drivers. # -zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o tuner-objs := tuner-core.o tuner-types.o tuner-simple.o \ @@ -23,7 +22,6 @@ obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o -obj-$(CONFIG_VIDEO_ZR36120) += zoran.o obj-$(CONFIG_VIDEO_SAA6588) += saa6588.o obj-$(CONFIG_VIDEO_SAA5246A) += saa5246a.o obj-$(CONFIG_VIDEO_SAA5249) += saa5249.o @@ -92,6 +90,9 @@ obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o +obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o +obj-$(CONFIG_VIDEO_OV7670) += ov7670.o + obj-$(CONFIG_USB_DABUSB) += dabusb.o obj-$(CONFIG_USB_OV511) += ov511.o obj-$(CONFIG_USB_SE401) += se401.o |