aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/025-bcma_backport.patch
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2016-10-12 00:14:59 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-10-12 00:14:59 +0200
commit4acd4da998e71c681f7030f9706abda055f95ccc (patch)
treec4e36c8bff97c48764ac93ae46a84b70a79072d6 /target/linux/generic/patches-3.18/025-bcma_backport.patch
parent9c840109de4494b3ecc29917090deb13518338ad (diff)
downloadmaster-187ad058-4acd4da998e71c681f7030f9706abda055f95ccc.tar.gz
master-187ad058-4acd4da998e71c681f7030f9706abda055f95ccc.tar.bz2
master-187ad058-4acd4da998e71c681f7030f9706abda055f95ccc.zip
Revert "kernel: bump 3.18 to 3.18.39"
Stay on 3.18.36 This reverts commit 83767cf94f909f5932540da7641a12b7dfa71d85.
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 ec1cb004b7..ca24e86133 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
-@@ -22,6 +22,7 @@ struct bcma_bus;
+@@ -24,6 +24,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
-@@ -448,4 +448,6 @@ extern u32 bcma_chipco_pll_read(struct b
+@@ -447,4 +447,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);