diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-03-02 13:18:47 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-03-02 13:18:47 +0000 |
| commit | 85c5082af9d7f794a63d79fd674dfe2bb09243b0 (patch) | |
| tree | b72ca5b3b9dba8033b8dec3b8f39d3a2125443ff /target/linux/generic/patches-2.6.32/975-ssb_update.patch | |
| parent | 5511d4ff1a176ecd6d22458ec911e3f27c4c3937 (diff) | |
| download | upstream-85c5082af9d7f794a63d79fd674dfe2bb09243b0.tar.gz upstream-85c5082af9d7f794a63d79fd674dfe2bb09243b0.tar.bz2 upstream-85c5082af9d7f794a63d79fd674dfe2bb09243b0.zip | |
[kernel/2.6.32] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30777 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.32/975-ssb_update.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.32/975-ssb_update.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.32/975-ssb_update.patch b/target/linux/generic/patches-2.6.32/975-ssb_update.patch index 4d4d608532..0564fa3c76 100644 --- a/target/linux/generic/patches-2.6.32/975-ssb_update.patch +++ b/target/linux/generic/patches-2.6.32/975-ssb_update.patch @@ -206,7 +206,7 @@ u32 pmucap; if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU)) -@@ -509,15 +518,12 @@ void ssb_pmu_init(struct ssb_chipcommon +@@ -509,15 +518,12 @@ void ssb_pmu_init(struct ssb_chipcommon ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n", cc->pmu.rev, pmucap); @@ -1468,7 +1468,7 @@ /* TODO - get remaining rev 8 stuff needed */ } -@@ -572,37 +682,34 @@ static int sprom_extract(struct ssb_bus +@@ -572,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); @@ -1527,7 +1527,7 @@ } if (out->boardflags_lo == 0xFFFF) -@@ -616,15 +723,14 @@ static int sprom_extract(struct ssb_bus +@@ -616,15 +723,14 @@ static int sprom_extract(struct ssb_bus static int ssb_pci_sprom_get(struct ssb_bus *bus, struct ssb_sprom *sprom) { @@ -2309,7 +2309,7 @@ /* Suspend a SSB bus. * Call this from the parent bus suspend routine. */ -@@ -667,6 +695,7 @@ extern int ssb_bus_may_powerdown(struct +@@ -667,6 +695,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); |