ar71xx: sync ethernet driver changes with trunk to fix MDIO issues on ar7240

[openwrt-10.03/.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_phy.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index eada693e7722cae6846a174df2ddb040cd42d3aa..d70aaf0921fdcb714808a2c08ecdae6e50d91770 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@ -190,7 +190,7 @@ static struct mii_bus *dev_to_mii_bus(struct device *dev)
        return NULL;
 }
 
        return NULL;
 }
 

-int ag71xx_phy_connect(struct ag71xx *ag)
+int __devinit ag71xx_phy_connect(struct ag71xx *ag)

 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 


@@ -217,7 +217,7 @@ int ag71xx_phy_connect(struct ag71xx *ag)
        return ag71xx_phy_connect_fixed(ag);
 }
 
        return ag71xx_phy_connect_fixed(ag);
 }
 

-void ag71xx_phy_disconnect(struct ag71xx *ag)
+void __devexit ag71xx_phy_disconnect(struct ag71xx *ag)

 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);