[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches

[openwrt.git] / target / linux / ixp4xx / patches-2.6.31 / 205-npe_driver_separate_phy_functions.patch

diff --git a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
index 857d959..b9835a0 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
+++ b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
@@ -99,12 +99,21 @@
        if ((err = register_netdev(dev)))
                goto err_phy_dis;
  
        if ((err = register_netdev(dev)))
                goto err_phy_dis;
  

-@@ -1249,7 +1283,7 @@ static int __devexit eth_remove_one(stru
-       struct net_device *dev = platform_get_drvdata(pdev);
+@@ -1232,7 +1266,7 @@ static int __devinit eth_init_one(struct
+       return 0;
+ 
+ err_phy_dis:
+-      phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(port->phydev);
+ err_free_mem:
+       npe_port_tab[NPE_ID(port->id)] = NULL;
+       platform_set_drvdata(pdev, NULL);
+@@ -1250,7 +1284,7 @@ static int __devexit eth_remove_one(stru

        struct port *port = netdev_priv(dev);
  
        struct port *port = netdev_priv(dev);
  

+       unregister_netdev(dev);

 -      phy_disconnect(port->phydev);
 +      ixp4xx_phy_disconnect(dev);
 -      phy_disconnect(port->phydev);
 +      ixp4xx_phy_disconnect(dev);

-       unregister_netdev(dev);
-       phy_disconnect(port->phydev);

        npe_port_tab[NPE_ID(port->id)] = NULL;
        npe_port_tab[NPE_ID(port->id)] = NULL;

+       platform_set_drvdata(pdev, NULL);
+       npe_release(port->npe);