summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-04-28 16:52:11 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-04-28 16:52:11 +0000
commit1bac172c44fd96ee1c5ed94ce2879b15c7a23745 (patch)
treeebb49ea0f4f71c657aaf7c9a0c54521ea6e1fc9e /target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
parentf1e214411d8fe78a19d4df6837f4cbc4aa136667 (diff)
downloadmaster-31e0f0ae-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.tar.gz
master-31e0f0ae-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.tar.bz2
master-31e0f0ae-1bac172c44fd96ee1c5ed94ce2879b15c7a23745.zip
kernel: update bcma and ssb for kernel 3.8+ to version from wireless-testing master-2013-04-26.
SVN-Revision: 36473
Diffstat (limited to 'target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch b/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
index 6c17fb90a9..1148a489db 100644
--- a/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
+++ b/target/linux/brcm47xx/patches-3.8/060-ssb-add-serial-flash-driver.patch
@@ -296,7 +296,7 @@
}
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
-@@ -549,6 +549,15 @@ static int ssb_devices_register(struct s
+@@ -545,6 +545,15 @@ static int ssb_devices_register(struct s
dev_idx++;
}
@@ -314,7 +314,7 @@
err = platform_device_register(&ssb_pflash_dev);
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
-@@ -220,6 +220,7 @@ extern u32 ssb_chipco_watchdog_timer_set
+@@ -231,6 +231,7 @@ extern u32 ssb_chipco_watchdog_timer_set
/* driver_chipcommon_sflash.c */
#ifdef CONFIG_SSB_SFLASH
int ssb_sflash_init(struct ssb_chipcommon *cc);