diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-04-30 15:53:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-04-30 15:53:08 +0000 |
| commit | 3ea657a3e9e755239446dcdbe65069aabc4ecb25 (patch) | |
| tree | 5fc9baf5bbe1b1588fd5dc3adcdb803b24bf5fae /target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch | |
| parent | 845f57debb5658cbef9c6a27583bf1a20c1844c4 (diff) | |
| download | master-31e0f0ae-3ea657a3e9e755239446dcdbe65069aabc4ecb25.tar.gz master-31e0f0ae-3ea657a3e9e755239446dcdbe65069aabc4ecb25.tar.bz2 master-31e0f0ae-3ea657a3e9e755239446dcdbe65069aabc4ecb25.zip | |
kernel: bring ssb in sync with upstream (as of current wireless-testing)
SVN-Revision: 21269
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch index f396ca745a..a6ab0292ba 100644 --- a/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch +++ b/target/linux/brcm47xx/patches-2.6.33/220-bcm5354.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/driver_chipcommon.c +++ b/drivers/ssb/driver_chipcommon.c -@@ -258,6 +258,8 @@ void ssb_chipco_resume(struct ssb_chipco +@@ -260,6 +260,8 @@ void ssb_chipco_resume(struct ssb_chipco void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc, u32 *plltype, u32 *n, u32 *m) { @@ -9,7 +9,7 @@ *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N); *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT); switch (*plltype) { -@@ -281,6 +283,8 @@ void ssb_chipco_get_clockcpu(struct ssb_ +@@ -283,6 +285,8 @@ void ssb_chipco_get_clockcpu(struct ssb_ void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc, u32 *plltype, u32 *n, u32 *m) { @@ -31,7 +31,7 @@ } --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -1069,6 +1069,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) +@@ -1072,6 +1072,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) if (bus->chip_id == 0x5365) { rate = 100000000; |