From 949cfbb24374be151e2c01db09dd98bc8537a989 Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Fri, 30 Sep 2016 08:34:01 +0200 Subject: kernel: update kernel 4.4 to version 4.4.22 Forgot to update kernel-version.mk, so updated patch. Compile-tested on x86/64 and ar71xx; run-tested on x86/64 and ar71xx. Signed-off-by: Stijn Segers --- .../0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch | 4 ++-- target/linux/ramips/patches-4.4/0200-linkit_bootstrap.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/ramips/patches-4.4') diff --git a/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch b/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch index 5e5cfe2065..1bd29747b8 100644 --- a/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch +++ b/target/linux/ramips/patches-4.4/0033-xhci-mediatek-support-MTK-xHCI-host-controller.patch @@ -1420,7 +1420,7 @@ Signed-off-by: Greg Kroah-Hartman /* * Returns zero if the TRB isn't in this segment, otherwise it returns the DMA -@@ -3084,17 +3085,22 @@ static u32 xhci_td_remainder(struct xhci +@@ -3088,17 +3089,22 @@ static u32 xhci_td_remainder(struct xhci { u32 maxp, total_packet_count; @@ -1447,7 +1447,7 @@ Signed-off-by: Greg Kroah-Hartman /* Queueing functions don't count the current TRB into transferred */ return (total_packet_count - ((transferred + trb_buff_len) / maxp)); } -@@ -3482,7 +3488,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * +@@ -3486,7 +3492,7 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * field |= 0x1; /* xHCI 1.0/1.1 6.4.1.2.1: Transfer Type field */ diff --git a/target/linux/ramips/patches-4.4/0200-linkit_bootstrap.patch b/target/linux/ramips/patches-4.4/0200-linkit_bootstrap.patch index 70e8170c44..6e11075d54 100644 --- a/target/linux/ramips/patches-4.4/0200-linkit_bootstrap.patch +++ b/target/linux/ramips/patches-4.4/0200-linkit_bootstrap.patch @@ -1,6 +1,6 @@ --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile -@@ -56,3 +56,4 @@ obj-$(CONFIG_GENWQE) += genwqe/ +@@ -57,3 +57,4 @@ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o obj-$(CONFIG_CXL_BASE) += cxl/ -- cgit v1.2.3