aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2021-12-23 11:37:55 +0100
committerPetr Štetiar <ynezz@true.cz>2021-12-29 08:52:36 +0100
commit81d0b4a9f431b2b2ca71edca91febedde98994a3 (patch)
tree1ba3dcc529a31e52f22f56291e849fd845e9d3e3 /target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
parent1d94f72439034c112bfa4b694fc736123f4890a5 (diff)
downloadupstream-81d0b4a9f431b2b2ca71edca91febedde98994a3.tar.gz
upstream-81d0b4a9f431b2b2ca71edca91febedde98994a3.tar.bz2
upstream-81d0b4a9f431b2b2ca71edca91febedde98994a3.zip
kernel: bump 4.14 to 4.14.259
All patches refreshed automagically without conflicts, but upstream in commit 48c2461f28fe ("ARM: 8800/1: use choice for kernel unwinders") added new config options UNWINDER_ARM and UNWINDER_FRAME_POINTER so we need to adjust default configs as well. Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia. Signed-off-by: Petr Štetiar <ynezz@true.cz> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch')
-rw-r--r--target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
index 5a0fe0ad1b..d813aa42c9 100644
--- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
+++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
@@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -2050,7 +2050,8 @@ static const struct usb_device_id option
+@@ -2058,7 +2058,8 @@ static const struct usb_device_id option
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
{ USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },