diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
| commit | 9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6 (patch) | |
| tree | 3c4aef6e759fbdd74af7f5e14a495f531dc88515 /target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch | |
| parent | e952654f0b002e6494cfdb705ee8f0646798dd6c (diff) | |
| download | upstream-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.tar.gz upstream-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.tar.bz2 upstream-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.zip | |
kernel: update 3.18 to 3.18.16
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46011
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch b/target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch index e3c8e1352d..957bb680bd 100644 --- a/target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch +++ b/target/linux/brcm47xx/patches-3.18/032-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch @@ -21,8 +21,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> include/linux/ssb/ssb.h | 3 +++ 2 files changed, 9 insertions(+) -diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c -index 4048083..92a6c9d 100644 --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c @@ -531,6 +531,8 @@ static int mac_addr_used = 2; @@ -34,7 +32,7 @@ index 4048083..92a6c9d 100644 nvram_read_macaddr(prefix, "et0macaddr", sprom->et0mac, fallback); nvram_read_u8(prefix, NULL, "et0mdcport", &sprom->et0mdcport, 0, fallback); -@@ -543,6 +545,10 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, +@@ -543,6 +545,10 @@ static void bcm47xx_fill_sprom_ethernet( nvram_read_u8(prefix, NULL, "et1phyaddr", &sprom->et1phyaddr, 0, fallback); |