diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-19 11:12:43 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-19 11:12:43 +0000 |
| commit | 0f5b1a3ecae01bd64378b898246e006e22c9b539 (patch) | |
| tree | fff9b91aaed0bc78fb8082de5b431cb9bc977cd5 /target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch | |
| parent | 631e98977b4a4dadde7671f3a35bf3f3a10d11dc (diff) | |
| download | upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.gz upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.tar.bz2 upstream-0f5b1a3ecae01bd64378b898246e006e22c9b539.zip | |
kernel: update 4.0 to 4.0.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46063
Diffstat (limited to 'target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch b/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch index e3c8e1352d..957bb680bd 100644 --- a/target/linux/brcm47xx/patches-4.0/031-04-MIPS-BCM47xx-Extract-info-about-et2-interface.patch +++ b/target/linux/brcm47xx/patches-4.0/031-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); |