aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/025-bcma_backport.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-09-15 21:16:34 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2016-10-24 20:25:14 +0300
commit75e63c249411773613f3f201bea9245623d9f57a (patch)
treedfa1b1919a901a291d53cbd91a683153279287ea /target/linux/generic/patches-3.18/025-bcma_backport.patch
parent2fc3680dd066419576cb0129d0c1bd7618b90f1a (diff)
downloadupstream-75e63c249411773613f3f201bea9245623d9f57a.tar.gz
upstream-75e63c249411773613f3f201bea9245623d9f57a.tar.bz2
upstream-75e63c249411773613f3f201bea9245623d9f57a.zip
kernel: update kernel 3.18 to version 3.18.43
Refresh patches for all targets supporting 3.18 and not marked broken. Compile-tested on all targets using 3.18 and not marked broken. Changes to generic/610-netfilter_match_bypass_default_checks.patch based on 84d489f64f3b382d5544e342f66d8806e94e85d3. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/patches-3.18/025-bcma_backport.patch')
-rw-r--r--target/linux/generic/patches-3.18/025-bcma_backport.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/025-bcma_backport.patch b/target/linux/generic/patches-3.18/025-bcma_backport.patch
index ca24e86133..ec1cb004b7 100644
--- a/target/linux/generic/patches-3.18/025-bcma_backport.patch
+++ b/target/linux/generic/patches-3.18/025-bcma_backport.patch
@@ -1,6 +1,6 @@
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
-@@ -24,6 +24,7 @@ struct bcma_bus;
+@@ -22,6 +22,7 @@ struct bcma_bus;
/* main.c */
bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
int timeout);
@@ -223,7 +223,7 @@
core->core_index, bcma_device_name(&core->id),
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
-@@ -447,4 +447,6 @@ extern u32 bcma_chipco_pll_read(struct b
+@@ -448,4 +448,6 @@ extern u32 bcma_chipco_pll_read(struct b
#define BCMA_DMA_TRANSLATION_DMA64_CMT 0x80000000 /* Client Mode Translation for 64-bit DMA */
extern u32 bcma_core_dma_translation(struct bcma_device *core);