The patch titled
BCM47XX: use new SSB SPROM data structure
has been removed from the -mm tree. Its filename was
bcm47xx-use-new-ssb-sprom-data-structure.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: BCM47XX: use new SSB SPROM data structure
From: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Switch the BCM47XX code to the new SPROM data structure now that the old one
has been removed.
Signed-off-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/mips/bcm47xx/setup.c | 12 ++++++------
arch/mips/bcm47xx/wgt634u.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff -puN arch/mips/bcm47xx/setup.c~bcm47xx-use-new-ssb-sprom-data-structure arch/mips/bcm47xx/setup.c
--- a/arch/mips/bcm47xx/setup.c~bcm47xx-use-new-ssb-sprom-data-structure
+++ a/arch/mips/bcm47xx/setup.c
@@ -92,17 +92,17 @@ static int bcm47xx_get_invariants(struct
iv->sprom.revision = 3;
if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
- str2eaddr(buf, iv->sprom.r1.et0mac);
+ str2eaddr(buf, iv->sprom.et0mac);
if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
- str2eaddr(buf, iv->sprom.r1.et1mac);
+ str2eaddr(buf, iv->sprom.et1mac);
if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
- iv->sprom.r1.et0phyaddr = simple_strtoul(buf, NULL, 10);
+ iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 10);
if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
- iv->sprom.r1.et1phyaddr = simple_strtoul(buf, NULL, 10);
+ iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 10);
if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
- iv->sprom.r1.et0mdcport = simple_strtoul(buf, NULL, 10);
+ iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
- iv->sprom.r1.et1mdcport = simple_strtoul(buf, NULL, 10);
+ iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
return 0;
}
diff -puN arch/mips/bcm47xx/wgt634u.c~bcm47xx-use-new-ssb-sprom-data-structure arch/mips/bcm47xx/wgt634u.c
--- a/arch/mips/bcm47xx/wgt634u.c~bcm47xx-use-new-ssb-sprom-data-structure
+++ a/arch/mips/bcm47xx/wgt634u.c
@@ -50,7 +50,7 @@ static int __init wgt634u_init(void)
* been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx.
*/
- u8 *et0mac = ssb_bcm47xx.sprom.r1.et0mac;
+ u8 *et0mac = ssb_bcm47xx.sprom.et0mac;
if (et0mac[0] == 0x00 &&
((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
_
Patches currently in -mm which might be from aurelien@xxxxxxxxxxx are
origin.patch
git-kvm.patch
ssb-pci-core-driver-use-new-sprom-data-structure.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
