This patch update applies to master, 13.2 and 13.1 branches.
Signed-off-by: Guillaume GARDET
---
patches.rpmify/chipidea-clean-up-dependencies | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/patches.rpmify/chipidea-clean-up-dependencies b/patches.rpmify/chipidea-clean-up-dependencies
index 169ce8e..f0c455f 100644
--- a/patches.rpmify/chipidea-clean-up-dependencies
+++ b/patches.rpmify/chipidea-clean-up-dependencies
@@ -1,7 +1,12 @@
-From: Jeff Mahoney
+From: Guillaume GARDET
Subject: chipidea: Allow user to select PCI/IMX options
-Patch-mainline: Submitted to LKML Aug 27 2012
+Patch-mainline: V1 submitted to LKML Aug 27 2012
+* V2:
+Change _PCI and _IMX from bool to tristate to fix USB when CONFIG_USB_CHIPIDEA
+is a module. Tested on iMX6 board (Sabre Lite).
+
+* V1:
The chipidea driver currently has needless ifneq rules in the makefile
for things that should be config options. This can be problematic,
especially in the IMX case, since the OF dependency will be met
@@ -12,6 +17,7 @@ This patch adds _PCI and _IMX config options to allow the user to
select whether to build the modules.
Signed-off-by: Jeff Mahoney
+Signed-off-by: Guillaume GARDET
---
drivers/usb/chipidea/Kconfig | 11 +++++++++++
drivers/usb/chipidea/Makefile | 11 ++---------
@@ -24,13 +30,13 @@ Signed-off-by: Jeff Mahoney
Say Y here to enable debugging output of the ChipIdea driver.
+config USB_CHIPIDEA_PCI
-+ bool "ChipIdea PCI support"
++ tristate "ChipIdea PCI support"
+ depends on PCI
+ help
+ This option enables ChipIdea support on PCI.
+
+config USB_CHIPIDEA_IMX
-+ bool "ChipIdea IMX support"
++ tristate "ChipIdea IMX support"
+ depends on OF
+ help
+ This option enables ChipIdea support on IMX.
--
1.8.4.5
--
To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org
To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org
