aboutsummaryrefslogtreecommitdiffstats
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
commitae2e90bc13cdf21e5b20ca7cb01b7ba941caea17 (patch)
tree0516de45f32f24e8f665c62ebc95cc1a27a04bac /target/linux/generic/patches-2.6.39/020-ssb_update.patch
parentc2634162e3b3c09958ff994ab7feefdf4c61b1f4 (diff)
downloadupstream-ae2e90bc13cdf21e5b20ca7cb01b7ba941caea17.tar.gz
upstream-ae2e90bc13cdf21e5b20ca7cb01b7ba941caea17.tar.bz2
upstream-ae2e90bc13cdf21e5b20ca7cb01b7ba941caea17.zip
generic/2.6.39: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30458 3c298f89-4303-0410-b956-a3cf2f4a3e73
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);