aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.37
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-03-02 13:19:02 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-03-02 13:19:02 +0000
commitc2038600169bfbc9f43ac90d94ff80f972c3dbb2 (patch)
treeb6b93202712659f0886d314a26979ce75f86fa56 /target/linux/generic/patches-2.6.37
parent0d3f5b980e2d90c18059ee47b9894f11492d2dcd (diff)
downloadupstream-c2038600169bfbc9f43ac90d94ff80f972c3dbb2.tar.gz
upstream-c2038600169bfbc9f43ac90d94ff80f972c3dbb2.tar.bz2
upstream-c2038600169bfbc9f43ac90d94ff80f972c3dbb2.zip
refresh patches
SVN-Revision: 30781
Diffstat (limited to 'target/linux/generic/patches-2.6.37')
-rw-r--r--target/linux/generic/patches-2.6.37/020-ssb_update.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.37/020-ssb_update.patch b/target/linux/generic/patches-2.6.37/020-ssb_update.patch
index d773a4fc90..c894d55dbb 100644
--- a/target/linux/generic/patches-2.6.37/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.37/020-ssb_update.patch
@@ -504,7 +504,7 @@
/* TODO - get remaining rev 8 stuff needed */
}
-@@ -573,37 +682,34 @@ static int sprom_extract(struct ssb_bus
+@@ -573,37 +682,34 @@ static int sprom_extract(struct ssb_bus
ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
memset(out->et0mac, 0xFF, 6); /* preset et0 and et1 mac */
memset(out->et1mac, 0xFF, 6);
@@ -563,7 +563,7 @@
}
if (out->boardflags_lo == 0xFFFF)
-@@ -617,15 +723,14 @@ static int sprom_extract(struct ssb_bus
+@@ -617,15 +723,14 @@ static int sprom_extract(struct ssb_bus
static int ssb_pci_sprom_get(struct ssb_bus *bus,
struct ssb_sprom *sprom)
{
@@ -861,7 +861,7 @@
/* Suspend a SSB bus.
* Call this from the parent bus suspend routine. */
-@@ -514,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -514,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
* Otherwise static always-on powercontrol will be used. */
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);