diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 76d079204df113afa9e382a43abb5e1a2135150d (patch) | |
tree | 8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch | |
parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
download | upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45711
Diffstat (limited to 'target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-3.18/206-npe_driver_add_update_link_function.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 cb06069d85..f1a77078c4 100644 --- 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; |