diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-19 12:13:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-19 12:13:55 -0300 |
| commit | fde8743297a686ad2993a1775348d058b1943c50 (patch) | |
| tree | fc94d87a0a550cf095ca89526268f98509bf102d /linux/drivers/media | |
| parent | d36c36c111fbbc58f065d0bde02cd2685daddc01 (diff) | |
| download | mediapointer-dvb-s2-fde8743297a686ad2993a1775348d058b1943c50.tar.gz mediapointer-dvb-s2-fde8743297a686ad2993a1775348d058b1943c50.tar.bz2 | |
backport kernel commit 59faba1b316a7798a33752b3889193333f8af1a0
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Original patch from Trent Piepho <xyzzy@speakeasy.org>. Its description:
Fix Kconfig dependency problems wrt boolean menuconfigs
If one has a dependency chain (tristate)FOO depends on (bool)BAR depends on
(tristate)BAZ, build problems will result. If BAZ=m, then BAR can be set
y, which allows FOO=y. It's possible to have FOO=y && BAZ=m, which
wouldn't be allowed if FOO depended directly on BAZ. In effect, the bool
promotes the tristate from m to y.
This ends up causing a problem with several menuconfigs that look like:
menuconfig BAR
bool
depends on BAZ [tristate]
if BAR
config FOO
tristate
endif
The solution used here is to add the dependencies of BAR to the if
statement, so that items in the if block will gain a direct
non-bool-promoted dependency on BAZ. This is how it would work if a menu
was used instead of an if block.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/radio/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig index efd2b7468..03ef88acd 100644 --- a/linux/drivers/media/dvb/Kconfig +++ b/linux/drivers/media/dvb/Kconfig @@ -11,7 +11,7 @@ menuconfig DVB_CAPTURE_DRIVERS ---help--- Say Y to select Digital TV adapters -if DVB_CAPTURE_DRIVERS +if DVB_CAPTURE_DRIVERS && DVB_CORE comment "Supported SAA7146 based PCI Adapters" depends on DVB_CORE && PCI && I2C diff --git a/linux/drivers/media/radio/Kconfig b/linux/drivers/media/radio/Kconfig index 2efe41ef4..a11417ac1 100644 --- a/linux/drivers/media/radio/Kconfig +++ b/linux/drivers/media/radio/Kconfig @@ -9,7 +9,7 @@ menuconfig RADIO_ADAPTERS ---help--- Say Y here to enable selecting AM/FM radio adapters. -if RADIO_ADAPTERS +if RADIO_ADAPTERS && VIDEO_DEV config RADIO_CADET tristate "ADS Cadet AM/FM Tuner" diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 573633384..f2e46849d 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -11,7 +11,7 @@ menuconfig VIDEO_CAPTURE_DRIVERS webcams, analog TV, and hybrid analog/digital TV. Some of those devices also supports FM radio. -if VIDEO_CAPTURE_DRIVERS +if VIDEO_CAPTURE_DRIVERS && VIDEO_DEV config VIDEO_ADV_DEBUG bool "Enable advanced debug functionality" @@ -354,7 +354,7 @@ endmenu # encoder / decoder chips config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI && VIDEO_DEV + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 && PCI select VIDEO_BUF default n ---help--- @@ -707,7 +707,7 @@ menuconfig V4L_USB_DRIVERS depends on USB default y -if V4L_USB_DRIVERS +if V4L_USB_DRIVERS && USB source "drivers/media/video/pvrusb2/Kconfig" |