Merge commit 'origin'

[karo-tx-linux.git] / drivers / net / ibm_newemac / phy.c

diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
index 606db53ef78e76a9662729982d5a2fe886bd0abd..c40cd8df2212089e2f810bd1f25e0f6354dc42f3 100644 (file)
--- a/drivers/net/ibm_newemac/phy.c
+++ b/drivers/net/ibm_newemac/phy.c
@@ -362,7 +362,7 @@ static struct mii_phy_def bcm5248_phy_def = {
 
 static int m88e1111_init(struct mii_phy *phy)
 {
-       pr_debug("%s: Marvell 88E1111 Ethernet\n", __FUNCTION__);
+       pr_debug("%s: Marvell 88E1111 Ethernet\n", __func__);
        phy_write(phy, 0x14, 0x0ce3);
        phy_write(phy, 0x18, 0x4101);
        phy_write(phy, 0x09, 0x0e00);