From be678855b5125118d949a7607a10aad6e7d83026 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 18 Jun 2012 10:30:30 -0700 Subject: [PATCH] 3.0-stable patches added patches: usb-mos7840-fix-compilation-of-usb-serial-driver.patch --- queue-3.0/series | 1 + ...fix-compilation-of-usb-serial-driver.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 queue-3.0/usb-mos7840-fix-compilation-of-usb-serial-driver.patch diff --git a/queue-3.0/series b/queue-3.0/series index dcd0d4c9b25..eb152e9bc43 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -9,3 +9,4 @@ usb-option-fix-port-data-abuse.patch hfsplus-fix-overflow-in-sector-calculations-in-hfsplus_submit_bio.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.0/usb-mos7840-fix-compilation-of-usb-serial-driver.patch b/queue-3.0/usb-mos7840-fix-compilation-of-usb-serial-driver.patch new file mode 100644 index 00000000000..5cb8edf2ad5 --- /dev/null +++ b/queue-3.0/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 +Date: Tue, 5 Jun 2012 17:58:04 +0400 +Subject: USB: mos7840: Fix compilation of usb serial driver + +From: Tony Zelenoff + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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)}, -- 2.47.3