diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:25:20 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-07-19 20:25:20 +0000 |
commit | 49edb3c342b79913df0fa0b16719e2afcab7cfdc (patch) | |
tree | db3c0bd78af0dd17e5233982fdb1edadfd25bb28 /target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch | |
parent | 0799e77a8b44009bb6fc34a314bcbf8c970ad47a (diff) | |
download | upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.tar.gz upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.tar.bz2 upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.zip |
brcm47xx: prepare brcm47xx patches for sending to mainline.
SVN-Revision: 22296
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch index 1d75e171d3..0bc9e7ea4c 100644 --- a/target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch +++ b/target/linux/brcm47xx/patches-2.6.35/220-bcm5354.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/driver_chipcommon.c +++ b/drivers/ssb/driver_chipcommon.c -@@ -260,6 +260,8 @@ void ssb_chipco_resume(struct ssb_chipco +@@ -285,6 +285,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) { -@@ -283,6 +285,8 @@ void ssb_chipco_get_clockcpu(struct ssb_ +@@ -308,6 +310,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 -@@ -1073,6 +1073,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) +@@ -1075,6 +1075,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) if (bus->chip_id == 0x5365) { rate = 100000000; |