summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-19 12:39:40 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-19 12:39:40 +0000
commit01ca6e26f97769bf7e81ca0d0311d726ed0c00f3 (patch)
tree1154d32bae6311f288b651ef5e23df029de445c9 /target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
parent53ef695f50ba613668f815a3ca38d9f59877c3f3 (diff)
kernel: backport SSB/BCMA changes in preparation for a compat-wireless update
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36367 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
index 98cd795a52..9775879691 100644
--- a/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
+++ b/target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch
@@ -292,7 +292,7 @@
u32 id, id2;
switch (cc->capabilities & BCMA_CC_CAP_FLASHT) {
-@@ -150,6 +375,12 @@ int bcma_sflash_init(struct bcma_drv_cc
+@@ -150,6 +375,12 @@ int bcma_sflash_init(struct bcma_drv_cc
sflash->numblocks = e->numblocks;
sflash->size = sflash->blocksize * sflash->numblocks;
sflash->present = true;
@@ -316,7 +316,7 @@
/** ChipCommon core registers. **/
#define BCMA_CC_ID 0x0000
#define BCMA_CC_ID_ID 0x0000FFFF
-@@ -519,17 +521,6 @@ struct bcma_pflash {
+@@ -520,17 +522,6 @@ struct bcma_pflash {
u32 window_size;
};
@@ -334,7 +334,7 @@
#ifdef CONFIG_BCMA_NFLASH
struct mtd_info;
-@@ -564,7 +555,7 @@ struct bcma_drv_cc {
+@@ -565,7 +556,7 @@ struct bcma_drv_cc {
#ifdef CONFIG_BCMA_DRIVER_MIPS
struct bcma_pflash pflash;
#ifdef CONFIG_BCMA_SFLASH