kernel: update 3.18 to 3.18.14

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-3.18 / 206-npe_driver_add_update_link_function.patch

diff --git a/target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch b/target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch
index cb06069d85b636ec352f0735c1c295193c0b29d0..f1a77078c4a63c170106d9aefea96e5546b0b46a 100644 (file)
--- a/target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch
+++ b/target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch
@@ -9,7 +9,7 @@
        u8 firmware[4];
        int hwts_tx_en;
        int hwts_rx_en;
-@@ -562,37 +562,52 @@ static void ixp4xx_mdio_remove(void)
+@@ -558,37 +558,52 @@ static void ixp4xx_mdio_remove(void)
        mdiobus_free(mdio_bus);
  }
  
@@ -77,7 +77,7 @@
  static int ixp4xx_phy_connect(struct net_device *dev)
  {
        struct port *port = netdev_priv(dev);
-@@ -628,7 +643,6 @@ static void ixp4xx_phy_start(struct net_
+@@ -624,7 +639,6 @@ static void ixp4xx_phy_start(struct net_
  {
        struct port *port = netdev_priv(dev);
  
@@ -85,7 +85,7 @@
        phy_start(port->phydev);
  }
  
-@@ -1524,6 +1538,10 @@ static int eth_init_one(struct platform_
+@@ -1515,6 +1529,10 @@ static int eth_init_one(struct platform_
        if ((err = register_netdev(dev)))
                goto err_phy_dis;