aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
commit098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch)
treee4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
parentbbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff)
downloadmaster-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz
master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2
master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.zip
kernel: update 4.1 to 4.1.5
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch')
-rw-r--r--target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
index 199cd0135e..f7543cca73 100644
--- a/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1570,6 +1570,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1571,6 +1571,7 @@ config CPU_CAVIUM_OCTEON
select CPU_SUPPORTS_HUGEPAGES
select USB_EHCI_BIG_ENDIAN_MMIO
select MIPS_L1_CACHE_SHIFT_7
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
help
The Cavium Octeon processor is a highly integrated chip containing
many ethernet hardware widgets for networking tasks. The processor
-@@ -1865,6 +1866,9 @@ config MIPS_MALTA_PM
+@@ -1866,6 +1867,9 @@ config MIPS_MALTA_PM
bool
default y