aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-04-28 16:52:11 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-04-28 16:52:11 +0000
commit585001781b4e29b78cf720d2b222474314ff9a50 (patch)
tree3bff9515a1ab51c4f01de123f5fb1e267ea82f5d /target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
parentfde7fcd36c26e0cbec5a590e36c145285b211f1f (diff)
downloadupstream-585001781b4e29b78cf720d2b222474314ff9a50.tar.gz
upstream-585001781b4e29b78cf720d2b222474314ff9a50.tar.bz2
upstream-585001781b4e29b78cf720d2b222474314ff9a50.zip
kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master-2013-04-26.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36473 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch b/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
index 0bd23cc714..bba2b69e46 100644
--- a/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
+++ b/target/linux/brcm47xx/patches-3.8/070-bcma-add-functions-to-write-to-serial-flash.patch
@@ -269,7 +269,7 @@
/** ChipCommon core registers. **/
#define BCMA_CC_ID 0x0000
-@@ -520,19 +521,6 @@ struct bcma_pflash {
+@@ -523,19 +524,6 @@ struct bcma_pflash {
u32 window_size;
};
@@ -289,7 +289,7 @@
#ifdef CONFIG_BCMA_NFLASH
struct mtd_info;
-@@ -566,7 +554,7 @@ struct bcma_drv_cc {
+@@ -570,7 +558,7 @@ struct bcma_drv_cc {
#ifdef CONFIG_BCMA_DRIVER_MIPS
struct bcma_pflash pflash;
#ifdef CONFIG_BCMA_SFLASH