diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-04 15:53:01 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-04 15:53:01 +0000 |
| commit | 0d6d67e4b9f702284357cebd6d9709828b6f89da (patch) | |
| tree | a61aa35ad5f22c285824fe2962e839bcb58f30ab /target/linux/generic/patches-2.6.38/020-ssb_update.patch | |
| parent | 4f7c8b760c3fed2d3acac7eb2255ecbd1da97668 (diff) | |
[kernel/2.6.38] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31191 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/020-ssb_update.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.38/020-ssb_update.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-2.6.38/020-ssb_update.patch b/target/linux/generic/patches-2.6.38/020-ssb_update.patch index 41556285e..8269ac344 100644 --- a/target/linux/generic/patches-2.6.38/020-ssb_update.patch +++ b/target/linux/generic/patches-2.6.38/020-ssb_update.patch @@ -403,7 +403,7 @@ sprom_extract_r458(out, in); /* TODO - get remaining rev 8 stuff needed */ -@@ -641,7 +706,7 @@ static int sprom_extract(struct ssb_bus +@@ -641,7 +706,7 @@ static int sprom_extract(struct ssb_bus break; default: ssb_printk(KERN_WARNING PFX "Unsupported SPROM" @@ -412,7 +412,7 @@ " v1\n", out->revision); out->revision = 1; sprom_extract_r123(out, in); -@@ -658,7 +723,6 @@ static int sprom_extract(struct ssb_bus +@@ -658,7 +723,6 @@ static int sprom_extract(struct ssb_bus static int ssb_pci_sprom_get(struct ssb_bus *bus, struct ssb_sprom *sprom) { @@ -1428,7 +1428,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); |