aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-07-22 21:40:41 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-07-22 21:40:41 +0000
commita3df2250cbd23608c175fb402d73d2c19667e89f (patch)
tree969e0b684de55fc8f2701a45d2ca6fc2bfcee961 /target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
parent1413678b0717fa8b5b598f0c55a8f42b9f983094 (diff)
downloadmaster-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/121-bcma-get-irqs-from-dt.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch b/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
index 28ad8d514c..f81541fdf2 100644
--- a/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
+++ b/target/linux/bcm53xx/patches-3.14/121-bcma-get-irqs-from-dt.patch
@@ -59,7 +59,7 @@ with the irq number and add it to the core configuration.
static int bcma_register_cores(struct bcma_bus *bus)
{
struct bcma_device *core;
-@@ -154,7 +188,13 @@ static int bcma_register_cores(struct bc
+@@ -155,7 +189,13 @@ static int bcma_register_cores(struct bc
break;
case BCMA_HOSTTYPE_SOC:
core->dev.dma_mask = &core->dev.coherent_dma_mask;