aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-11-29 12:09:42 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-11-29 12:09:42 +0000
commit6384a68295482b34bfe359b1dfd7d2bdecc8fd6c (patch)
tree4f3a81776b1b9457fa1da236b1cc1e2949544e1f /target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch
parent32e3529836aad24907fab8bf73250825fc8b233c (diff)
downloadupstream-6384a68295482b34bfe359b1dfd7d2bdecc8fd6c.tar.gz
upstream-6384a68295482b34bfe359b1dfd7d2bdecc8fd6c.tar.bz2
upstream-6384a68295482b34bfe359b1dfd7d2bdecc8fd6c.zip
Remove patches already applied in generic and refresh patches.
This fixes #6200 SVN-Revision: 18597
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch
index a6a5e95198..837bd43e75 100644
--- a/target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.28/220-bcm5354.patch
@@ -1,6 +1,6 @@
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
-@@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
+@@ -258,6 +258,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) {
-@@ -293,6 +295,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
+@@ -281,6 +283,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
-@@ -1011,6 +1011,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1013,6 +1013,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
if (bus->chip_id == 0x5365) {
rate = 100000000;