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:56:39 +0200
committerGitHub <noreply@github.com>2016-10-12 00:56:39 +0200
commit093184fcc4232f9b7e397e872d18772592c16cd5 (patch)
treeec112cdb04541c437183cade6d4cd95e6286e9e9 /target/linux/generic/patches-3.18/025-bcma_backport.patch
parent7f0cba3eb9b5ab3a575875593777f269363c4d42 (diff)
parenta7099373073304de9c0b6aa6d0909b4d079ebe2f (diff)
downloadmaster-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.tar.gz
master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.tar.bz2
master-187ad058-093184fcc4232f9b7e397e872d18772592c16cd5.zip
Merge pull request #127 from wigyori/legacy-revert
Revert legacy kernels (3.18/4.1) to last known-good release
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);