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>

1 files changed, 4 insertions, 24 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3e4ce4aade3e..bb7df8c18b03 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -307,38 +307,18 @@ config VIDEO_TCM825X
 
 config VIDEO_SAA7110
         tristate "Philips SAA7110 video decoder"
-        depends on VIDEO_V4L1 && I2C
+        depends on VIDEO_V4L2 && I2C
         ---help---
           Support for the Philips SAA7110 video decoders.
 
           To compile this driver as a module, choose M here: the
           module will be called saa7110.
 
-config VIDEO_SAA7111
-        tristate "Philips SAA7111 video decoder"
-        depends on VIDEO_V4L1 && I2C
-        ---help---
-          Support for the Philips SAA711 video decoder.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7111.
-
-config VIDEO_SAA7114
-        tristate "Philips SAA7114 video decoder"
-        depends on VIDEO_V4L1 && I2C
-        ---help---
-          Support for the Philips SAA7114 video decoder. This driver
-          is used only on Zoran driver and should be moved soon to
-          SAA711x module.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa7114.
-
 config VIDEO_SAA711X
-        tristate "Philips SAA7113/4/5 video decoders"
+        tristate "Philips SAA7111/3/4/5 video decoders"
         depends on VIDEO_V4L2 && I2C
         ---help---
-          Support for the Philips SAA7113/4/5 video decoders.
+          Support for the Philips SAA7111/3/4/5 video decoders.
 
           To compile this driver as a module, choose M here: the
           module will be called saa7115.
@@ -639,7 +619,7 @@ config VIDEO_MXB
         depends on PCI && VIDEO_V4L1 && I2C
         select VIDEO_SAA7146_VV
         select VIDEO_TUNER
-        select VIDEO_SAA7115 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TEA6420 if VIDEO_HELPER_CHIPS_AUTO