diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-22 21:40:41 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-07-22 21:40:41 +0000 |
| commit | 0d3690a202894a87e4cb1a1ba7542917f0b29a8d (patch) | |
| tree | 8ca27050505b3eca1431c1e488d2661c39ab9fe7 /target/linux/bcm53xx/patches-3.14/123-bcma-get-sprom-from-devicetree.patch | |
| parent | 1e710a93ebe1110e356af2bb1b71c78b51c10607 (diff) | |
| download | upstream-0d3690a202894a87e4cb1a1ba7542917f0b29a8d.tar.gz upstream-0d3690a202894a87e4cb1a1ba7542917f0b29a8d.tar.bz2 upstream-0d3690a202894a87e4cb1a1ba7542917f0b29a8d.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>
SVN-Revision: 41804
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, }; |