kernel/3.18: update to version 3.18.25

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.18 / 192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch

diff --git a/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch b/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
index f56941cbb8fc724d3829bca9aa94d06988e34349..cf5b3fe34ca3e2d84d2fabadd1279ea8afd241aa 100644 (file)
--- a/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
+++ b/target/linux/generic/patches-3.18/192-USB-qcserial-Add-support-for-Quectel-EC20-Mini-PCIe-.patch
@@ -50,8 +50,6 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
  drivers/usb/serial/qcserial.c |   39 +++++++++++++++++++++++++++++++++++++++
  1 file changed, 39 insertions(+)
 
-diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c
-index ebcec8c..d462132 100644
 --- a/drivers/usb/serial/qcserial.c
 +++ b/drivers/usb/serial/qcserial.c
 @@ -22,6 +22,8 @@
@@ -63,7 +61,7 @@ index ebcec8c..d462132 100644
  /* standard device layouts supported by this driver */
  enum qcserial_layouts {
        QCSERIAL_G2K = 0,       /* Gobi 2000 */
-@@ -167,6 +169,38 @@ static const struct usb_device_id id_table[] = {
+@@ -166,6 +168,38 @@ static const struct usb_device_id id_tab
  };
  MODULE_DEVICE_TABLE(usb, id_table);
  
@@ -102,7 +100,7 @@ index ebcec8c..d462132 100644
  static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
  {
        struct usb_host_interface *intf = serial->interface->cur_altsetting;
-@@ -235,6 +269,11 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
+@@ -234,6 +268,11 @@ static int qcprobe(struct usb_serial *se
                        altsetting = -1;
                break;
        case QCSERIAL_G2K:
@@ -114,6 +112,3 @@ index ebcec8c..d462132 100644
                /*
                 * Gobi 2K+ USB layout:
                 * 0: QMI/net
--- 
-1.7.9.5
-