V4L/DVB (7133): Fix Kconfig dependencies

As pointed by Adrian Bunk, with I2C=m and VIDEO_DEV=y, videodev brokes.

This patch moves the functions that videodev needs from v4l2-common. It also
fixes some Kconfig changes.

After this patch, I2C=m / VIDEO_DEV=y will make v4l2 core statically linked
into kernel. v4l2-common will be m, and all V4L drivers will also be m.

This approach is very conservative, since it is possible to have V4L drivers
that don't need I2C or v4l2-common. The better is to map what drivers really
need v4l2-common, making them to select v4l2-common, and allowing the others to
be 'y', 'm' and 'n'.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 707b20d7efb7..888dcadff710 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -32,9 +32,9 @@ config VIDEO_V4L2_COMMON
 
 config VIDEO_V4L1
         bool "Enable Video For Linux API 1 (DEPRECATED)"
-        depends on VIDEO_DEV
+        depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+        default VIDEO_DEV && VIDEO_V4L2_COMMON
         select VIDEO_V4L1_COMPAT
-        default y
         ---help---
           Enables a compatibility API used by most V4L2 devices to allow
           its usage with legacy applications that supports only V4L1 api.
@@ -44,7 +44,7 @@ config VIDEO_V4L1
 config VIDEO_V4L1_COMPAT
         bool "Enable Video For Linux API 1 compatible Layer"
         depends on VIDEO_DEV
-        default y
+        default VIDEO_DEV
         ---help---
           This api were developed to be used at Kernel 2.2 and 2.4, but
           lacks support for several video standards. There are several
@@ -60,8 +60,8 @@ config VIDEO_V4L1_COMPAT
 
 config VIDEO_V4L2
         bool
-        depends on VIDEO_DEV
-        default y
+        depends on VIDEO_DEV && VIDEO_V4L2_COMMON
+        default VIDEO_DEV && VIDEO_V4L2_COMMON
 
 source "drivers/media/video/Kconfig"
 
@@ -185,7 +185,6 @@ config VIDEO_TVEEPROM
 
 config DAB
         boolean "DAB adapters"
-        default y
         ---help---
           Allow selecting support for for Digital Audio Broadcasting (DAB)
           Receiver adapters.