aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-03-23 13:28:52 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-03-23 13:28:52 +0000
commit2375f37723dfd443a1d7663b65c695025b55e87e (patch)
tree80a7531c7756758d5ed1d1d48d326636830d6c1d /target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch
parenta86b430a8502af6b82eef213feefdf6d72a21063 (diff)
downloadupstream-2375f37723dfd443a1d7663b65c695025b55e87e.tar.gz
upstream-2375f37723dfd443a1d7663b65c695025b55e87e.tar.bz2
upstream-2375f37723dfd443a1d7663b65c695025b55e87e.zip
generic/3.18: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 44951
Diffstat (limited to 'target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch')
-rw-r--r--target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch11
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch b/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch
index fd3e11d672..17fe5dff5e 100644
--- a/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch
+++ b/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch
@@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bgmac.c | 7 -------
1 file changed, 7 deletions(-)
-diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
-index 676ffe0..0469f72 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -302,9 +302,6 @@ static int bgmac_dma_rx_skb_for_slot(struct bgmac *bgmac,
+@@ -302,9 +302,6 @@ static int bgmac_dma_rx_skb_for_slot(str
slot->skb = skb;
slot->dma_addr = dma_addr;
@@ -32,7 +30,7 @@ index 676ffe0..0469f72 100644
return 0;
}
-@@ -505,8 +502,6 @@ static int bgmac_dma_alloc(struct bgmac *bgmac)
+@@ -505,8 +502,6 @@ static int bgmac_dma_alloc(struct bgmac
ring->mmio_base);
goto err_dma_free;
}
@@ -41,7 +39,7 @@ index 676ffe0..0469f72 100644
ring->unaligned = bgmac_dma_unaligned(bgmac, ring,
BGMAC_DMA_RING_TX);
-@@ -536,8 +531,6 @@ static int bgmac_dma_alloc(struct bgmac *bgmac)
+@@ -536,8 +531,6 @@ static int bgmac_dma_alloc(struct bgmac
err = -ENOMEM;
goto err_dma_free;
}
@@ -50,6 +48,3 @@ index 676ffe0..0469f72 100644
ring->unaligned = bgmac_dma_unaligned(bgmac, ring,
BGMAC_DMA_RING_RX);
---
-1.8.4.5
-