diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-12 16:02:34 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-12 16:02:34 +0000 |
| commit | 4e7d2ffce589a195c89e45b373717dbd0a00052e (patch) | |
| tree | d1a6d5f02ec019759d6af4e293f127f1ec061533 /target/linux/lantiq | |
| parent | 51a243f3c112e6946575381ef5531fb1e51370e8 (diff) | |
| download | upstream-4e7d2ffce589a195c89e45b373717dbd0a00052e.tar.gz upstream-4e7d2ffce589a195c89e45b373717dbd0a00052e.tar.bz2 upstream-4e7d2ffce589a195c89e45b373717dbd0a00052e.zip | |
CC: kernel: update 3.18 to 3.18.18
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18
Backport of r46299, r46303 and r46308.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46309 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch | 2 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0032-USB-fix-roothub-for-IFXHCD.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch index 85311c21f2..a123ce384f 100644 --- a/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-3.18/0001-MIPS-lantiq-add-pcie-driver.patch @@ -5514,7 +5514,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> (transaction layer end-to-end CRC checking). --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1160,6 +1160,8 @@ void pci_walk_bus(struct pci_bus *top, i +@@ -1156,6 +1156,8 @@ void pci_walk_bus(struct pci_bus *top, i void *userdata); int pci_cfg_space_size(struct pci_dev *dev); unsigned char pci_bus_max_busnr(struct pci_bus *bus); diff --git a/target/linux/lantiq/patches-3.18/0032-USB-fix-roothub-for-IFXHCD.patch b/target/linux/lantiq/patches-3.18/0032-USB-fix-roothub-for-IFXHCD.patch index 673e3de824..cf2c5cbd5b 100644 --- a/target/linux/lantiq/patches-3.18/0032-USB-fix-roothub-for-IFXHCD.patch +++ b/target/linux/lantiq/patches-3.18/0032-USB-fix-roothub-for-IFXHCD.patch @@ -20,7 +20,7 @@ Subject: [PATCH 32/36] USB: fix roothub for IFXHCD choice --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4319,7 +4319,7 @@ hub_port_init (struct usb_hub *hub, stru +@@ -4303,7 +4303,7 @@ hub_port_init (struct usb_hub *hub, stru udev->ttport = hdev->ttport; } else if (udev->speed != USB_SPEED_HIGH && hdev->speed == USB_SPEED_HIGH) { |