← Back to branch summary

~ubuntu-branches/ubuntu/wily/linux-ti-omap4/wily

« back to all changes in this revision

Viewing changes to drivers/usb/serial/ftdi_sio.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Ubuntu: 3.5.0-26.42
  • Date: 2013-03-14 15:21:40 UTC
  • mfrom: (76.1.1 quantal-proposed)
  • Revision ID: package-import@ubuntu.com-20130314152140-tl4mkjmxa038tm3h
Tags: 3.5.0-221.31
https://launchpad.net/bugs/1153648
https://launchpad.net/bugs/1152715
https://launchpad.net/bugs/1122094
https://launchpad.net/bugs/1147678
* Release Tracking Bug
  - LP: #1153648

[ Paolo Pisati ]

* rebased on Ubuntu-3.5.0-26.42

[ Ubuntu: 3.5.0-26.42 ]

* Release Tracking Bug
  - LP: #1152715
* ubuntu: overlayfs -- fix missmerge of vfs_open changes
  - LP: #1122094, #1147678

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/serial/ftdi_sio.c
590
590
        /*
591
591
         * ELV devices:
592
592
         */
 
593
        { USB_DEVICE(FTDI_ELV_VID, FTDI_ELV_WS300_PID) },
593
594
        { USB_DEVICE(FTDI_VID, FTDI_ELV_USR_PID) },
594
595
        { USB_DEVICE(FTDI_VID, FTDI_ELV_MSM1_PID) },
595
596
        { USB_DEVICE(FTDI_VID, FTDI_ELV_KL100_PID) },
676
677
        { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) },
677
678
        { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) },
678
679
        { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
 
680
        { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) },
679
681
        { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
680
682
        { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
681
683
        { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },