aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 10:58:35 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-28 18:17:32 +0100
commitaa95bdd80f05ae14705481df57e8ee0370452399 (patch)
treef28102101b867ab6af29118d7c0a821faed32617 /target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
parent50b3044eebea8a3f840babaadc4e850214ac29c5 (diff)
downloadupstream-aa95bdd80f05ae14705481df57e8ee0370452399.tar.gz
upstream-aa95bdd80f05ae14705481df57e8ee0370452399.tar.bz2
upstream-aa95bdd80f05ae14705481df57e8ee0370452399.zip
kernel: bump 3.18 to 3.18.133
Refreshed all patches. Compile-tested on: adm5120 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch')
-rw-r--r--target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch b/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
index c008aea41d..7a64ae7994 100644
--- a/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/pending-3.18/132-mips_inline_dma_ops.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -1450,6 +1450,7 @@ config CPU_CAVIUM_OCTEON
+@@ -1453,6 +1453,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@nbd.name>
help
The Cavium Octeon processor is a highly integrated chip containing
many ethernet hardware widgets for networking tasks. The processor
-@@ -1705,6 +1706,9 @@ config MIPS_MALTA_PM
+@@ -1708,6 +1709,9 @@ config MIPS_MALTA_PM
bool
default y