aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-10-02 15:29:16 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-10-02 16:05:34 +0200
commit8cc7ac54b6cfbccf61f31c51313e6480811b5f44 (patch)
tree4a0f1d2c650d837e1fd6a0156827c4a1ac958bf8 /target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
parent1c95d78f087c9cd78caf17181525c8853d78bf1c (diff)
downloadupstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.gz
upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.tar.bz2
upstream-8cc7ac54b6cfbccf61f31c51313e6480811b5f44.zip
kernel: bump 5.4 to 5.4.150
Manually rebased: generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch generic/pending-5.4/800-bcma-get-SoC-device-struct-copy-its-DMA-params-to-th.patch mvebu/patches-5.4/021-arm64-dts-marvell-armada-37xx-Move-PCIe-comphy-handl.patch Removed upstreamed: generic/backport-5.4/040-ARM-8918-2-only-build-return_address-if-needed.patch layerscape/patches-5.4/819-uart-0004-MLK-18137-fsl_lpuart-Fix-loopback-mode.patch All others updated automatically. Compile-tested on: lantiq/xrx200, armvirt/64 Runtime-tested on: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch')
-rw-r--r--target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
index 6e4584c8a1..86f8a416e9 100644
--- a/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
+++ b/target/linux/generic/pending-5.4/811-pci_disable_usb_common_quirks.patch
@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* __LINUX_USB_PCI_QUIRKS_H */
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
-@@ -483,7 +483,14 @@ extern int usb_hcd_pci_probe(struct pci_
+@@ -485,7 +485,14 @@ extern int usb_hcd_pci_probe(struct pci_
extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev);