3.7-stable patches

added patches:
	ezusb-add-dependency-to-usb.patch

diff --git a/queue-3.7/ezusb-add-dependency-to-usb.patch b/queue-3.7/ezusb-add-dependency-to-usb.patch
new file mode 100644 (file)
index 0000000..f10bafe
--- /dev/null
+++ b/queue-3.7/ezusb-add-dependency-to-usb.patch
@@ -0,0 +1,31 @@
+From 9db72fe6c943852032d9ed863c87e8c02d3cb9da Mon Sep 17 00:00:00 2001
+From: Rene Buergel <rene.buergel@sohard.de>
+Date: Thu, 22 Nov 2012 19:10:50 +0100
+Subject: ezusb: add dependency to USB
+
+From: Rene Buergel <rene.buergel@sohard.de>
+
+commit 9db72fe6c943852032d9ed863c87e8c02d3cb9da upstream.
+
+This fixes an error during modpost, when ezusb is built into the kernel
+while USB is built as module.
+
+Signed-off-by: René Bürgel <rene.buergel@sohard.de>
+Cc: Jeff Mahoney <jeffm@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ drivers/usb/misc/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/misc/Kconfig
++++ b/drivers/usb/misc/Kconfig
+@@ -246,6 +246,7 @@ config USB_YUREX
+ 
+ config USB_EZUSB_FX2
+       tristate "Functions for loading firmware on EZUSB chips"
++      depends on USB
+       help
+         Say Y here if you need EZUSB device support.
+         (Cypress FX/FX2/FX2LP microcontrollers)

diff --git a/queue-3.7/series b/queue-3.7/series
index 2bc5a58fb92dea7f0b7532f5170017d214af4928..73ecb1b3b94677fc8320d52295860afbcd9fd7c6 100644 (file)
--- a/queue-3.7/series
+++ b/queue-3.7/series
@@ -2,3 +2,4 @@ mm-dmapool-use-provided-gfp-flags-for-all-dma_alloc_coherent-calls.patch
 clk-ux500-fix-bit-error.patch
 x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch
 telephony-ijx-buffer-overflow-in-ixj_write_cid.patch
+ezusb-add-dependency-to-usb.patch