drop broken 3.18 patch

diff --git a/queue-3.18/series b/queue-3.18/series
index 23bf07e372dd40bf4734696134611cb435b82cce..e539eee239719fd9fe4defd623b0947d7a0801f7 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,3 +1,2 @@
 usb-hso-fix-oob-memory-access-in-hso_probe-hso_get_config_data.patch
 usb-serial-option-add-hp-lt4132.patch
-usb-serial-option-add-fibocom-nl668-series.patch

diff --git a/queue-3.18/usb-serial-option-add-fibocom-nl668-series.patch b/queue-3.18/usb-serial-option-add-fibocom-nl668-series.patch
deleted file mode 100644 (file)
index 00590ce..0000000
--- a/queue-3.18/usb-serial-option-add-fibocom-nl668-series.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 30360224441ce89a98ed627861e735beb4010775 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rgen=20Storvist?= <jorgen.storvist@gmail.com>
-Date: Wed, 12 Dec 2018 21:47:36 +0100
-Subject: USB: serial: option: add Fibocom NL668 series
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jörgen Storvist <jorgen.storvist@gmail.com>
-
-commit 30360224441ce89a98ed627861e735beb4010775 upstream.
-
-Added USB serial option driver support for Fibocom NL668 series cellular
-modules. Reserved USB endpoints 4, 5 and 6 for network + ADB interfaces.
-
-usb-devices output (QMI mode)
-T:  Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 16 Spd=480 MxCh= 0
-D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
-P:  Vendor=1508 ProdID=1001 Rev=03.18
-S:  Manufacturer=Nodecom NL668 Modem
-S:  Product=Nodecom NL668-CN Modem
-S:  SerialNumber=
-C:  #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA
-I:  If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
-I:  If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-I:  If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-I:  If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-I:  If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
-I:  If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
-
-usb-devices output (ECM mode)
-T:  Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 17 Spd=480 MxCh= 0
-D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
-P:  Vendor=1508 ProdID=1001 Rev=03.18
-S:  Manufacturer=Nodecom NL668 Modem
-S:  Product=Nodecom NL668-CN Modem
-S:  SerialNumber=
-C:  #Ifs= 7 Cfg#= 1 Atr=a0 MxPwr=500mA
-I:  If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
-I:  If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-I:  If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-I:  If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
-I:  If#= 4 Alt= 0 #EPs= 1 Cls=02(commc) Sub=06 Prot=00 Driver=cdc_ether
-I:  If#= 5 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether
-I:  If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
-
-Signed-off-by: Jörgen Storvist <jorgen.storvist@gmail.com>
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/serial/option.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/usb/serial/option.c
-+++ b/drivers/usb/serial/option.c
-@@ -2048,6 +2048,8 @@ static const struct usb_device_id option
-       { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x13) },
-       { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x14) },
-       { USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0xa31d, 0xff, 0x06, 0x1b) },
-+      { USB_DEVICE(0x1508, 0x1001),                                           /* Fibocom NL668 */
-+        .driver_info = RSVD(4) | RSVD(5) | RSVD(6) },
-       { } /* Terminating entry */
- };
- MODULE_DEVICE_TABLE(usb, option_ids);