summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-08-14 21:07:42 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-08-14 21:07:42 +0000
commita1bee93fa0c3cdf8ea94d1ddcc46872a404bb2ff (patch)
tree21652a56d55e18f8c1d885231ed18780c87d5770 /target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch
parent78478d79736b35de7d3aaaeb988a10f96566971a (diff)
downloadmaster-31e0f0ae-a1bee93fa0c3cdf8ea94d1ddcc46872a404bb2ff.tar.gz
master-31e0f0ae-a1bee93fa0c3cdf8ea94d1ddcc46872a404bb2ff.tar.bz2
master-31e0f0ae-a1bee93fa0c3cdf8ea94d1ddcc46872a404bb2ff.zip
ixp4xx: refresh patches
SVN-Revision: 22649
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch b/target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch
index 419ec4cdb2..7ae1a8404d 100644
--- a/target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch
+++ b/target/linux/ixp4xx/patches-2.6.35/206-npe_driver_add_update_link_function.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -168,7 +168,7 @@ struct port {
+@@ -169,7 +169,7 @@ struct port {
struct desc *desc_tab; /* coherent */
u32 desc_tab_phys;
int id; /* logical port ID */
@@ -9,7 +9,7 @@
u8 firmware[4];
};
-@@ -365,37 +365,52 @@ static void ixp4xx_mdio_remove(void)
+@@ -366,37 +366,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);
-@@ -430,7 +445,6 @@ static void ixp4xx_phy_start(struct net_
+@@ -431,7 +446,6 @@ static void ixp4xx_phy_start(struct net_
{
struct port *port = netdev_priv(dev);
@@ -85,7 +85,7 @@
phy_start(port->phydev);
}
-@@ -1260,6 +1274,10 @@ static int __devinit eth_init_one(struct
+@@ -1263,6 +1277,10 @@ static int __devinit eth_init_one(struct
if ((err = register_netdev(dev)))
goto err_phy_dis;