diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-18 15:26:06 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:57 -0400 |
| commit | 107063c6156a0cbf055e771baafc28a3e3c0fb9b (patch) | |
| tree | 813a2dc2c1426521167f2f289d7a106aaf2f24ec /drivers/media/video/Makefile | |
| parent | 84c1b09495ea366276726b0df2dcd7898cda9d0f (diff) | |
V4L/DVB (10714): zoran et al: convert zoran i2c modules to V4L2.
The zoran i2c modules were still using V4L1 internally. Replace this
with V4L2. Also deleted saa7111.c and saa7114.c, we use saa7115.c instead.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
[mchehab@redhat.com: fix v4l2_ctrl_query_fill_std merge conflict]
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/Makefile')
| -rw-r--r-- | drivers/media/video/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 6e2c69569f97..307490ebc230 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
| @@ -43,8 +43,6 @@ obj-$(CONFIG_VIDEO_TDA9840) += tda9840.o | |||
| 43 | obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o | 43 | obj-$(CONFIG_VIDEO_TEA6415C) += tea6415c.o |
| 44 | obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o | 44 | obj-$(CONFIG_VIDEO_TEA6420) += tea6420.o |
| 45 | obj-$(CONFIG_VIDEO_SAA7110) += saa7110.o | 45 | obj-$(CONFIG_VIDEO_SAA7110) += saa7110.o |
| 46 | obj-$(CONFIG_VIDEO_SAA7111) += saa7111.o | ||
| 47 | obj-$(CONFIG_VIDEO_SAA7114) += saa7114.o | ||
| 48 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o | 46 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o |
| 49 | obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o | 47 | obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o |
| 50 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o | 48 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o |