This is a note to let you know that I've just added the patch titled
Properly handle tristate dependencies on USB/PCI menus
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
properly-handle-tristate-dependencies-on-usb-pci-menus.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 5077ac3b8108007f4a2b4589f2d373cf55453206 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Date: Wed, 22 May 2013 11:25:52 -0300
Subject: Properly handle tristate dependencies on USB/PCI menus
From: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
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@xxxxxxxxxx>
Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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.
Patches currently in stable-queue which might be from mchehab@xxxxxxxxxx are
queue-3.10/properly-handle-tristate-dependencies-on-usb-pci-menus.patch
queue-3.10/media-media-usb-fix-kconfig-dependencies.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html