kernel: bump 4.14 to 4.14.155

[oweals/openwrt.git] / target / linux / brcm63xx / patches-4.14 / 001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch

diff --git a/target/linux/brcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch b/target/linux/brcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch
index b3405e0eb2f9b4681f96f72ef5181c7801c30881..c489001332798b539722f11c101386e99b7b3a3c 100644 (file)
--- a/target/linux/brcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch
+++ b/target/linux/brcm63xx/patches-4.14/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch
@@ -13,7 +13,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
-@@ -1719,7 +1719,6 @@ static int bcm_enet_probe(struct platfor
+@@ -1720,7 +1720,6 @@ static int bcm_enet_probe(struct platfor
        struct bcm63xx_enet_platform_data *pd;
        struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
        struct mii_bus *bus;
@@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        int i, ret;
  
        if (!bcm_enet_shared_base[0])
-@@ -1760,14 +1759,12 @@ static int bcm_enet_probe(struct platfor
+@@ -1761,14 +1760,12 @@ static int bcm_enet_probe(struct platfor
        if (priv->mac_id == 0) {
                priv->rx_chan = 0;
                priv->tx_chan = 1;