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.10 | |
| 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.10')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch | 2 | ||||
| -rw-r--r-- | target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch b/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch index fe44827082..b15c012ab5 100644 --- a/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch +++ b/target/linux/bcm53xx/patches-3.10/111-bcma-register-bcma-as-device-tree-driver.patch @@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +#endif /* CONFIG_OF */ --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -319,6 +319,8 @@ struct bcma_bus { +@@ -322,6 +322,8 @@ struct bcma_bus { struct pci_dev *host_pci; /* Pointer to the SDIO device (only for BCMA_HOSTTYPE_SDIO) */ struct sdio_func *host_sdio; diff --git a/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch b/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch index 76641d802d..7c6cbbd364 100644 --- a/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch +++ b/target/linux/bcm53xx/patches-3.10/112-bcma-get-irqs-from-dt.patch @@ -57,7 +57,7 @@ Subject: [PATCH 7/8] bcma: get irqs from dt static int bcma_register_cores(struct bcma_bus *bus) { struct bcma_device *core; -@@ -145,7 +179,13 @@ static int bcma_register_cores(struct bc +@@ -146,7 +180,13 @@ static int bcma_register_cores(struct bc break; case BCMA_HOSTTYPE_SOC: core->dev.dma_mask = &core->dev.coherent_dma_mask; |