kernel: bump 4.14 to 4.14.155

[oweals/openwrt.git] / target / linux / brcm63xx / patches-4.14 / 001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch

diff --git a/target/linux/brcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch b/target/linux/brcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch
index 3a998e93090e9dc6e826fefe346bb9d2d803b653..f3ddd7445ceb7f205f5ed28d0d76d0fa60eedbad 100644 (file)
--- a/target/linux/brcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch
+++ b/target/linux/brcm63xx/patches-4.14/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch
@@ -45,7 +45,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  /*
 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
 +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
-@@ -1755,15 +1755,6 @@ static int bcm_enet_probe(struct platfor
+@@ -1756,15 +1756,6 @@ static int bcm_enet_probe(struct platfor
        priv->irq_tx = res_irq_tx->start;
        priv->mac_id = pdev->id;
  
@@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        priv->mac_clk = devm_clk_get(&pdev->dev, "enet");
        if (IS_ERR(priv->mac_clk)) {
                ret = PTR_ERR(priv->mac_clk);
-@@ -1795,6 +1786,8 @@ static int bcm_enet_probe(struct platfor
+@@ -1796,6 +1787,8 @@ static int bcm_enet_probe(struct platfor
                priv->dma_chan_width = pd->dma_chan_width;
                priv->dma_has_sram = pd->dma_has_sram;
                priv->dma_desc_shift = pd->dma_desc_shift;