diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-07-02 22:03:03 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-07-02 22:03:03 +0000 |
| commit | d412d3583ac5be8ad85e149ea2ad38b46e0f0cf0 (patch) | |
| tree | 0e9a74f4d4397040f5acb3965dea704af2c057ba /target | |
| parent | 33c281b77eefdb53b114bf91e2b1dcdf0edf089f (diff) | |
| download | upstream-d412d3583ac5be8ad85e149ea2ad38b46e0f0cf0.tar.gz upstream-d412d3583ac5be8ad85e149ea2ad38b46e0f0cf0.tar.bz2 upstream-d412d3583ac5be8ad85e149ea2ad38b46e0f0cf0.zip | |
brcm47xx: refresh patches
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41487 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch | 2 | ||||
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch b/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch index 9c669e6cb5..038e6a0b77 100644 --- a/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch +++ b/target/linux/brcm47xx/patches-3.10/095-MIPS-BCM47XX-Fix-some-very-confused-types-and-data-c.patch @@ -18,7 +18,7 @@ Patchwork: http://patchwork.linux-mips.org/patch/6211/ --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c -@@ -135,7 +135,7 @@ static void nvram_read_leddc(const char +@@ -135,7 +135,7 @@ static void nvram_read_leddc(const char } static void nvram_read_macaddr(const char *prefix, const char *name, diff --git a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch index eb5391ca13..a1ab0d2b09 100644 --- a/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch +++ b/target/linux/brcm47xx/patches-3.10/790-tg3-phylib.patch @@ -156,7 +156,7 @@ } else { u32 bmcr; -@@ -12122,7 +12129,7 @@ static int tg3_set_pauseparam(struct net +@@ -12124,7 +12131,7 @@ static int tg3_set_pauseparam(struct net u32 newadv; struct phy_device *phydev; @@ -165,7 +165,7 @@ if (!(phydev->supported & SUPPORTED_Pause) || (!(phydev->supported & SUPPORTED_Asym_Pause) && -@@ -13556,7 +13563,7 @@ static int tg3_ioctl(struct net_device * +@@ -13558,7 +13565,7 @@ static int tg3_ioctl(struct net_device * struct phy_device *phydev; if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED)) return -EAGAIN; @@ -174,7 +174,7 @@ return phy_mii_ioctl(phydev, ifr, cmd); } -@@ -17192,8 +17199,10 @@ static int tg3_init_one(struct pci_dev * +@@ -17194,8 +17201,10 @@ static int tg3_init_one(struct pci_dev * tg3_flag_set(tp, FLUSH_POSTED_WRITES); if (ssb_gige_one_dma_at_once(pdev)) tg3_flag_set(tp, ONE_DMA_AT_ONCE); @@ -186,7 +186,7 @@ if (ssb_gige_is_rgmii(pdev)) tg3_flag_set(tp, RGMII_MODE); } -@@ -17463,7 +17472,7 @@ static int tg3_init_one(struct pci_dev * +@@ -17464,7 +17473,7 @@ static int tg3_init_one(struct pci_dev * if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) { struct phy_device *phydev; |