summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.39/020-ssb_update.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-11 18:16:08 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-11 18:16:08 +0000
commit80a535ba586708d53ecc23fa527edc61fcbdd260 (patch)
treeacab53189cd8ef0f79964862a0181df68fdf100a /target/linux/generic/patches-2.6.39/020-ssb_update.patch
parent440a7fbc3bfd2489fd9e5eb7329557c86e34ae6d (diff)
downloadmaster-31e0f0ae-80a535ba586708d53ecc23fa527edc61fcbdd260.tar.gz
master-31e0f0ae-80a535ba586708d53ecc23fa527edc61fcbdd260.tar.bz2
master-31e0f0ae-80a535ba586708d53ecc23fa527edc61fcbdd260.zip
generic/2.6.39: refresh patches
SVN-Revision: 30458
Diffstat (limited to 'target/linux/generic/patches-2.6.39/020-ssb_update.patch')
-rw-r--r--target/linux/generic/patches-2.6.39/020-ssb_update.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.39/020-ssb_update.patch b/target/linux/generic/patches-2.6.39/020-ssb_update.patch
index 8113bca68f..d89b64b9d9 100644
--- a/target/linux/generic/patches-2.6.39/020-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.39/020-ssb_update.patch
@@ -864,7 +864,7 @@
sprom_extract_r458(out, in);
/* TODO - get remaining rev 8 stuff needed */
-@@ -662,7 +723,6 @@ static int sprom_extract(struct ssb_bus
+@@ -662,7 +723,6 @@ static int sprom_extract(struct ssb_bus
static int ssb_pci_sprom_get(struct ssb_bus *bus,
struct ssb_sprom *sprom)
{
@@ -1164,7 +1164,7 @@
/* Suspend a SSB bus.
* Call this from the parent bus suspend routine. */
-@@ -518,6 +538,7 @@ extern int ssb_bus_may_powerdown(struct
+@@ -518,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);