diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-09-02 10:18:15 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-09-02 10:18:15 +0000 |
| commit | 7d6cff4882e1484e09956e19825acdae3a68618c (patch) | |
| tree | 76a46ad583bca975dd2cb71f20543fa2c1eee425 /target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch | |
| parent | 7747092ed1d906b247d834735941d995a62c5556 (diff) | |
| download | mtk-20170518-7d6cff4882e1484e09956e19825acdae3a68618c.zip mtk-20170518-7d6cff4882e1484e09956e19825acdae3a68618c.tar.gz mtk-20170518-7d6cff4882e1484e09956e19825acdae3a68618c.tar.bz2 | |
kernel: update 3.18 to 3.18.21
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.21
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46768
Diffstat (limited to 'target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch')
| -rw-r--r-- | target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch b/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch index 15f5ee8..98e8ca5 100644 --- a/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch +++ b/target/linux/ramips/patches-3.18/0062-mt7621-add-ECHI-OCHI-XCHI-support.patch @@ -5546,7 +5546,7 @@ ctrl_ctx->add_flags |= cpu_to_le32(added_ctxs); new_add_flags = le32_to_cpu(ctrl_ctx->add_flags); -@@ -4451,8 +4597,14 @@ static u16 xhci_call_host_update_timeout +@@ -4454,8 +4600,14 @@ static u16 xhci_call_host_update_timeout u16 *timeout) { if (state == USB3_LPM_U1) @@ -5561,7 +5561,7 @@ return xhci_calculate_u2_timeout(xhci, udev, desc); return USB3_LPM_DISABLED; -@@ -4837,7 +4989,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4840,7 +4992,9 @@ int xhci_gen_setup(struct usb_hcd *hcd, hcd->self.no_sg_constraint = 1; /* XHCI controllers don't stop the ep queue on short packets :| */ @@ -5571,7 +5571,7 @@ if (usb_hcd_is_primary_hcd(hcd)) { xhci = kzalloc(sizeof(struct xhci_hcd), GFP_KERNEL); -@@ -4900,6 +5054,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, +@@ -4903,6 +5057,10 @@ int xhci_gen_setup(struct usb_hcd *hcd, goto error; xhci_dbg(xhci, "Reset complete\n"); @@ -5582,7 +5582,7 @@ /* Set dma_mask and coherent_dma_mask to 64-bits, * if xHC supports 64-bit addressing */ if (HCC_64BIT_ADDR(xhci->hcc_params) && -@@ -4994,8 +5152,57 @@ MODULE_DESCRIPTION(DRIVER_DESC); +@@ -4997,8 +5155,57 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_LICENSE("GPL"); |