diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-27 21:28:40 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-27 21:28:40 +0000 |
| commit | ca979845ccc58feb6ca04e913d24414fe90708c4 (patch) | |
| tree | 6fcc301d99db0e44a014bd66cc9cf97c5148274b /target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch | |
| parent | e439de144f0bd6dd3cdea921960bb5ae9a7be208 (diff) | |
| download | upstream-ca979845ccc58feb6ca04e913d24414fe90708c4.tar.gz upstream-ca979845ccc58feb6ca04e913d24414fe90708c4.tar.bz2 upstream-ca979845ccc58feb6ca04e913d24414fe90708c4.zip | |
kernel: update ssb and bcma to linux-next next-20110627
SVN-Revision: 27295
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch index e1d5d90ebc..d68534fb65 100644 --- a/target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch +++ b/target/linux/brcm47xx/patches-2.6.39/220-bcm5354.patch @@ -1,6 +1,6 @@ --- a/drivers/ssb/driver_chipcommon.c +++ b/drivers/ssb/driver_chipcommon.c -@@ -285,6 +285,8 @@ void ssb_chipco_resume(struct ssb_chipco +@@ -317,6 +317,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) { -@@ -308,6 +310,8 @@ void ssb_chipco_get_clockcpu(struct ssb_ +@@ -340,6 +342,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 -@@ -1103,6 +1103,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) +@@ -1104,6 +1104,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus) if (bus->chip_id == 0x5365) { rate = 100000000; |