Skip to content

Commit

Permalink
V4L/DVB (7133): Fix Kconfig dependencies
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Feb 18, 2008
1 parent 1a4e30c commit 057596e
Show file tree
Hide file tree
Showing 8 changed files with 409 additions and 411 deletions.
11 changes: 5 additions & 6 deletions drivers/media/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand All @@ -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"

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/common/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ config VIDEO_SAA7146

config VIDEO_SAA7146_VV
tristate
depends on VIDEO_DEV
depends on VIDEO_V4L2
select VIDEOBUF_DMA_SG
select VIDEO_SAA7146
4 changes: 2 additions & 2 deletions drivers/media/radio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

menuconfig RADIO_ADAPTERS
bool "Radio Adapters"
depends on VIDEO_DEV
depends on VIDEO_V4L2
default y
---help---
Say Y here to enable selecting AM/FM radio adapters.

if RADIO_ADAPTERS && VIDEO_DEV
if RADIO_ADAPTERS && VIDEO_V4L2

config RADIO_CADET
tristate "ADS Cadet AM/FM Tuner"
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

menuconfig VIDEO_CAPTURE_DRIVERS
bool "Video capture adapters"
depends on VIDEO_DEV
depends on VIDEO_V4L2
default y
---help---
Say Y here to enable selecting the video adapters for
webcams, analog TV, and hybrid analog/digital TV.
Some of those devices also supports FM radio.

if VIDEO_CAPTURE_DRIVERS && VIDEO_DEV
if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2

config VIDEO_ADV_DEBUG
bool "Enable advanced debug functionality"
Expand Down
Loading

0 comments on commit 057596e

Please sign in to comment.