summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-05-22 11:25:52 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 11:40:28 -0300
commit5077ac3b8108007f4a2b4589f2d373cf55453206 (patch)
tree8aa2240a2470230a78b4e2e424399f01a857b6ff
parent7997196cb4fda8a5ad3570a5645bdc73024554ca (diff)
downloadop-kernel-dev-5077ac3b8108007f4a2b4589f2d373cf55453206.zip
op-kernel-dev-5077ac3b8108007f4a2b4589f2d373cf55453206.tar.gz
Properly handle tristate dependencies on USB/PCI menus
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>
-rw-r--r--drivers/media/pci/Kconfig4
-rw-r--r--drivers/media/usb/Kconfig3
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index d4e2ed3..53196f1 100644
--- 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/Kconfig"
endif
endif #MEDIA_PCI_SUPPORT
+endif #PCI
diff --git a/drivers/media/usb/Kconfig b/drivers/media/usb/Kconfig
index 0d8fe00..7cac453 100644
--- 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.
OpenPOWER on IntegriCloud