aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-12-02 21:52:41 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-12-02 21:52:41 +0000
commite4d66cd66d8fa4c266f4d1c55fff551462b62395 (patch)
tree2c7e46d8d26cdcd63b252bf5741a8535bb96bb46 /target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
parent080bc8eb39474e843c21a860ec4c4eaa11b77a99 (diff)
downloadmaster-187ad058-e4d66cd66d8fa4c266f4d1c55fff551462b62395.tar.gz
master-187ad058-e4d66cd66d8fa4c266f4d1c55fff551462b62395.tar.bz2
master-187ad058-e4d66cd66d8fa4c266f4d1c55fff551462b62395.zip
kernel: update 4.1 to 4.1.13
- two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin <roman@advem.lv> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47694 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch b/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
index f8d945d1ba..7b8ed25f0f 100644
--- a/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
+++ b/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
@@ -21,11 +21,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/bcm47xx/sprom.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 2d5c7a7..e19c1b9 100644
--- a/arch/mips/bcm47xx/sprom.c
+++ b/arch/mips/bcm47xx/sprom.c
-@@ -610,14 +610,18 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
+@@ -610,14 +610,18 @@ static int bcm47xx_get_sprom_ssb(struct
{
char prefix[10];
@@ -46,6 +44,3 @@ index 2d5c7a7..e19c1b9 100644
pr_warn("Unable to fill SPROM for given bustype.\n");
return -EINVAL;
}
---
-1.8.4.5
-