summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-22 12:32:03 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-06-22 12:32:03 +0000
commitf6e4eb15bc7b5991a484370ae3765eb79becea4b (patch)
tree8839ac68a6af6f6e8ea4e59190b0bfb2f1795cbc /target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
parentcda35d2ef2ba813d93e38c61539a70d3e0727048 (diff)
downloadmtk-20170518-f6e4eb15bc7b5991a484370ae3765eb79becea4b.zip
mtk-20170518-f6e4eb15bc7b5991a484370ae3765eb79becea4b.tar.gz
mtk-20170518-f6e4eb15bc7b5991a484370ae3765eb79becea4b.tar.bz2
register SSB sprom after ethernet devices
In case the MAC address pool is not big enough to also register a SSB SPROM prefer registering the Ethernet devices. SVN-Revision: 27258
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch')
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
index 349e5f5..c4dc287 100644
--- a/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch
@@ -18,7 +18,7 @@
#endif
/*
-@@ -2328,8 +2339,9 @@ void __init board_prom_init(void)
+@@ -2407,8 +2418,9 @@ int __init board_register_devices(void)
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
@@ -29,7 +29,7 @@
+ printk(KERN_ERR PFX "failed to register fallback SPROM\n");
}
#endif
- }
+
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -662,7 +662,6 @@ static int sprom_extract(struct ssb_bus