diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-04-19 12:39:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-04-19 12:39:40 +0000 |
| commit | f58dcb59c6621a9c587e3ce9705c88de6239b47e (patch) | |
| tree | 21d994e1e42ab31d89c6977a3bb2027a09129ba1 /target/linux/brcm47xx/patches-3.6/070-bcma-add-functions-to-write-to-serial-flash.patch | |
| parent | f03960723a9af29b7e6468212f336b28083050b5 (diff) | |
| download | upstream-f58dcb59c6621a9c587e3ce9705c88de6239b47e.tar.gz upstream-f58dcb59c6621a9c587e3ce9705c88de6239b47e.tar.bz2 upstream-f58dcb59c6621a9c587e3ce9705c88de6239b47e.zip | |
kernel: backport SSB/BCMA changes in preparation for a compat-wireless update
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36367
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.patch | 6 |
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 |