diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-22 12:32:03 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-22 12:32:03 +0000 |
| commit | d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2 (patch) | |
| tree | 532fbdfd4ec80d6ea49c41b9a9f777dfb9ebb0a6 /target/linux/brcm63xx/patches-2.6.39/500-ssb-add-callback-for-sprom.patch | |
| parent | 2bc81b5e4a4768b8c596a61ed110747f7c519f5a (diff) | |
| download | upstream-d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2.tar.gz upstream-d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2.tar.bz2 upstream-d72a90ee7b0f3e81b798b61a87f1ad16cea09bc2.zip | |
[brcm63xx] 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27258 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 4 |
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 349e5f5007..c4dc287c76 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 |