[ 37/49] Properly handle tristate dependencies on USB/PCI menus

Greg Kroah-Hartman
2013-09-29T19:48:04Z

From: Mauro Carvalho Chehab <mchehab@redhat.com>

commit 5077ac3b8108007f4a2b4589f2d373cf55453206 upstream.

As USB/PCI/MEDIA_SUPPORT dependencies can be tristate, we can't
simply make the bool menu to be dependent on it. Everything below
the menu should also depend on it, otherwise, we risk to allow
building them with 'y', while only 'm' would be supported.

So, add an IF just before everything below, in order to avoid
such risks.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
drivers/media/pci/Kconfig | 4 +++-
drivers/media/usb/Kconfig | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)

--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -1,6 +1,7 @@
+if PCI && MEDIA_SUPPORT
+
menuconfig MEDIA_PCI_SUPPORT
bool "Media PCI Adapters"
- depends on PCI && MEDIA_SUPPORT
help
Enable media drivers for PCI/PCIe bus.
If you have such devices, say Y.
@@ -45,3 +46,4 @@ source "drivers/media/pci/ddbridge/Kconf
endif

endif #MEDIA_PCI_SUPPORT
+endif #PCI
--- a/drivers/media/usb/Kconfig
+++ b/drivers/media/usb/Kconfig
@@ -1,8 +1,7 @@
-if USB
+if USB && MEDIA_SUPPORT

menuconfig MEDIA_USB_SUPPORT
bool "Media USB Adapters"
- depends on MEDIA_SUPPORT
help
Enable media drivers for USB bus.
If you have such devices, say Y.