kernel: bump 4.14 to 4.14.254

[openwrt/staging/hauke.git] / target / linux / apm821xx / patches-4.14 / 801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

diff --git a/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
index 6443057b0f649d17d239dd36f0d423369ef8665b..7efc437fa18e58bbf16e9841ca36a3daf7fce0ab 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
+++ b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
  
  #include "xhci.h"
  #include "xhci-trace.h"
-@@ -280,6 +282,458 @@ static void xhci_pme_acpi_rtd3_enable(st
+@@ -282,6 +284,458 @@ static void xhci_pme_acpi_rtd3_enable(st
  static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
  #endif /* CONFIG_ACPI */
  
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
  /* called during probe() after chip reset completes */
  static int xhci_pci_setup(struct usb_hcd *hcd)
  {
-@@ -318,6 +772,22 @@ static int xhci_pci_probe(struct pci_dev
+@@ -320,6 +774,22 @@ static int xhci_pci_probe(struct pci_dev
        struct hc_driver *driver;
        struct usb_hcd *hcd;
  
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
        driver = (struct hc_driver *)id->driver_data;
  
        /* For some HW implementation, a XHCI reset is just not enough... */
-@@ -379,6 +849,16 @@ static void xhci_pci_remove(struct pci_d
+@@ -381,6 +851,16 @@ static void xhci_pci_remove(struct pci_d
  {
        struct xhci_hcd *xhci;