diff options
author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-02 13:18:56 +0000 |
---|---|---|
committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-02 13:18:56 +0000 |
commit | a4906e04da77c551bf6d8e31ab6f858cf1541b90 (patch) | |
tree | a6e81eb17e08084625d7746ff1ebe9a5390dadde /target/linux/generic/patches-2.6.36/941-ssb_update.patch | |
parent | 5929a7798b5f7634463831a3994eaf081b19e89b (diff) |
[kernel/2.6.36] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30779 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/941-ssb_update.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.36/941-ssb_update.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.36/941-ssb_update.patch b/target/linux/generic/patches-2.6.36/941-ssb_update.patch index 80abe6597..9f8dfb878 100644 --- a/target/linux/generic/patches-2.6.36/941-ssb_update.patch +++ b/target/linux/generic/patches-2.6.36/941-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); |