aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-05-16 19:25:20 +0000
committerPeter Denison <openwrt@marshadder.org>2008-05-16 19:25:20 +0000
commit79aed699d71b9f583762a4b184bb7a68521dccb9 (patch)
tree74aaab10bc8d14ea76857a0ea17fc31419d255e9 /target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
parent9788ab458ceb294131f6145eba79dfd01e380ffc (diff)
downloadupstream-79aed699d71b9f583762a4b184bb7a68521dccb9.tar.gz
upstream-79aed699d71b9f583762a4b184bb7a68521dccb9.tar.bz2
upstream-79aed699d71b9f583762a4b184bb7a68521dccb9.zip
Remove files now present upstream in files-2.6.25 (This is mostly just drivers/ssb and include/linux/ssb) [brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set Default is still to build against 2.6.23.16
SVN-Revision: 11155
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
index 53818aba6d..2e1f77c5d0 100644
--- a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
+Index: linux-2.6.25/drivers/ssb/driver_chipcommon.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 13:46:08.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 13:46:17.000000000 +0100
+--- linux-2.6.25.orig/drivers/ssb/driver_chipcommon.c 2008-04-27 21:36:52.000000000 +0100
++++ linux-2.6.25/drivers/ssb/driver_chipcommon.c 2008-04-27 21:43:50.000000000 +0100
@@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
@@ -20,11 +20,11 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
switch (*plltype) {
-Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c
+Index: linux-2.6.25/drivers/ssb/driver_mipscore.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-02-19 13:46:08.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/driver_mipscore.c 2008-02-19 13:46:17.000000000 +0100
-@@ -160,6 +160,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
+--- linux-2.6.25.orig/drivers/ssb/driver_mipscore.c 2008-04-17 03:49:44.000000000 +0100
++++ linux-2.6.25/drivers/ssb/driver_mipscore.c 2008-04-27 21:43:50.000000000 +0100
+@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
rate = 200000000;
@@ -33,11 +33,11 @@ Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c
} else {
rate = ssb_calc_clock_rate(pll_type, n, m);
}
-Index: linux-2.6.23.16/drivers/ssb/main.c
+Index: linux-2.6.25/drivers/ssb/main.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 13:46:08.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 13:46:17.000000000 +0100
-@@ -862,6 +862,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+--- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-17 03:49:44.000000000 +0100
++++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:43:50.000000000 +0100
+@@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
if (bus->chip_id == 0x5365) {
rate = 100000000;