summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Zelenoff <antonz@parallels.com>2012-06-05 17:58:04 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-22 11:36:58 -0700
commit0fd47a3802d9fd08a65625572c5c4089aa6f3e78 (patch)
tree27b5839804fbcf33bf9d1c1c57ba7dcae2ba433f
parentbd1031c0027fab25f9d1e8229bc380298ae6d0a0 (diff)
downloadlinux-stable-0fd47a3802d9fd08a65625572c5c4089aa6f3e78.tar.gz
linux-stable-0fd47a3802d9fd08a65625572c5c4089aa6f3e78.tar.bz2
linux-stable-0fd47a3802d9fd08a65625572c5c4089aa6f3e78.zip
USB: mos7840: Fix compilation of usb serial driver
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>
-rw-r--r--drivers/usb/serial/mos7840.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index c526550694a0..62739ff58c72 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -206,7 +206,7 @@ static const struct usb_device_id moschip_port_id_table[] = {
{} /* 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)},