3.4-stable patches

added patches:
	usb-mos7840-fix-compilation-of-usb-serial-driver.patch

diff --git a/queue-3.4/series b/queue-3.4/series
index 330c08607549aef493cd7eeb0e0a9ac3706298ea..f067006ef6c5c820b6bdd86190a1a9bcd6f2a6e2 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -30,3 +30,4 @@ xhci-fix-invalid-loop-check-in-xhci_free_tt_info.patch
 xhci-don-t-free-endpoints-in-xhci_mem_cleanup.patch
 xhci-increase-the-timeout-for-controller-save-restore-state-operation.patch
 usb-storage-add-090c-1000-to-unusal-devs.patch
+usb-mos7840-fix-compilation-of-usb-serial-driver.patch

diff --git a/queue-3.4/usb-mos7840-fix-compilation-of-usb-serial-driver.patch b/queue-3.4/usb-mos7840-fix-compilation-of-usb-serial-driver.patch
new file mode 100644 (file)
index 0000000..5cb8edf
--- /dev/null
+++ b/queue-3.4/usb-mos7840-fix-compilation-of-usb-serial-driver.patch
@@ -0,0 +1,40 @@
+From b9c87663eead64c767e72a373ae6f8a94bead459 Mon Sep 17 00:00:00 2001
+From: Tony Zelenoff <antonz@parallels.com>
+Date: Tue, 5 Jun 2012 17:58:04 +0400
+Subject: USB: mos7840: Fix compilation of usb serial driver
+
+From: Tony Zelenoff <antonz@parallels.com>
+
+commit b9c87663eead64c767e72a373ae6f8a94bead459 upstream.
+
+The __devinitconst section can't be referenced
+from usb_serial_device structure. Thus removed it as
+it done in other mos* device drivers.
+
+Error itself:
+WARNING: drivers/usb/serial/mos7840.o(.data+0x8): Section mismatch in reference
+from the variable moschip7840_4port_device to the variable
+.devinit.rodata:id_table
+The variable moschip7840_4port_device references
+the variable __devinitconst id_table
+
+[v2] no attach now
+
+Signed-off-by: Tony Zelenoff <antonz@parallels.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/mos7840.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/serial/mos7840.c
++++ b/drivers/usb/serial/mos7840.c
+@@ -206,7 +206,7 @@ static const struct usb_device_id moschi
+       {}                      /* terminating entry */
+ };
+ 
+-static const struct usb_device_id moschip_id_table_combined[] __devinitconst = {
++static const struct usb_device_id moschip_id_table_combined[] = {
+       {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7840)},
+       {USB_DEVICE(USB_VENDOR_ID_MOSCHIP, MOSCHIP_DEVICE_ID_7820)},
+       {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USO9ML2_2)},