diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2014-07-22 21:40:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-07-22 21:40:41 +0000 |
commit | a3df2250cbd23608c175fb402d73d2c19667e89f (patch) | |
tree | 969e0b684de55fc8f2701a45d2ca6fc2bfcee961 /target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch | |
parent | 1413678b0717fa8b5b598f0c55a8f42b9f983094 (diff) | |
download | master-187ad058-a3df2250cbd23608c175fb402d73d2c19667e89f.tar.gz master-187ad058-a3df2250cbd23608c175fb402d73d2c19667e89f.tar.bz2 master-187ad058-a3df2250cbd23608c175fb402d73d2c19667e89f.zip |
kernel: update bcma and ssb to version master-2014-07-22
This is a backport of bcma and ssb from wireless-tesing/master tag
master-2014-07-22.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41804 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch b/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch index e071641088..a10542e7d3 100644 --- a/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch +++ b/target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch @@ -70,7 +70,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> static int bcma_fill_sprom_with_fallback(struct bcma_bus *bus, struct ssb_sprom *out) { -@@ -553,7 +595,14 @@ int bcma_sprom_get(struct bcma_bus *bus) +@@ -579,7 +621,14 @@ int bcma_sprom_get(struct bcma_bus *bus) u16 *sprom; size_t sprom_sizes[] = { SSB_SPROMSIZE_WORDS_R4, SSB_SPROMSIZE_WORDS_R10, }; |