X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-4.5;h=09a7faea25b22731484405a3f8792f14ecd025be;hb=8ffa4bd5e69bc232c20e1462ab325fbda0dd0a14;hp=938937fb2ca6c744124cccad882e128b828b990d;hpb=bdcc80ce35bdaec0adf19ea43149792b97cbbba0;p=releases.git

diff --git a/deblob-4.5 b/deblob-4.5
index 938937fb2ca6..09a7faea25b2 100755
--- a/deblob-4.5
+++ b/deblob-4.5
@@ -48,7 +48,7 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=4.5 extra=0--
+kver=4.5 extra=
 
 set -e
 
@@ -2743,11 +2743,13 @@ clean_blob drivers/usb/serial/mxuport.c
 clean_kconfig drivers/usb/serial/Kconfig USB_SERIAL_MXUPORT
 clean_mk CONFIG_USB_SERIAL_MXUPORT drivers/usb/serial/Makefile
 
-announce USB_SERIAL_MXUPORT11 - "USB Moxa UPORT 11x0 Serial Driver"
-reject_firmware drivers/usb/serial/mxu11x0.c
-clean_blob drivers/usb/serial/mxu11x0.c
-clean_kconfig drivers/usb/serial/Kconfig USB_SERIAL_MXUPORT11
-clean_mk CONFIG_USB_SERIAL_MXUPORT11 drivers/usb/serial/Makefile
+# This was removed in 4.5-rc7, but it will likely be back in some
+# future release, so let's keep the code commented out here.
+# announce USB_SERIAL_MXUPORT11 - "USB Moxa UPORT 11x0 Serial Driver"
+# reject_firmware drivers/usb/serial/mxu11x0.c
+# clean_blob drivers/usb/serial/mxu11x0.c
+# clean_kconfig drivers/usb/serial/Kconfig USB_SERIAL_MXUPORT11
+# clean_mk CONFIG_USB_SERIAL_MXUPORT11 drivers/usb/serial/Makefile
 
 announce USB_SERIAL_TI - "USB TI 3410/5052 Serial Driver"
 drop_fw_file firmware/ti_3410.fw.ihex firmware/ti_3410.fw