From ada4cf63dc92b95a434192dbbcfa4dd29b0324eb Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Mon, 28 Apr 2008 18:36:46 +0100
Subject: [PATCH] --- yaml --- r: 95363 b: refs/heads/master c:
 48c41b9941233a85ccdb88c579bd4e9b0ee609cf h: refs/heads/master i:   95361:
 c45817dc6c71a89368f17c842a0a99c6117910f5   95359:
 b582bf745a27d8b6045cf18098dd41b07afa38ce v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/phy/smsc.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 99c14d5afc0b..896152b458e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d12b132bc0bfb10d3f8d81f92606719b5032dcb
+refs/heads/master: 48c41b9941233a85ccdb88c579bd4e9b0ee609cf
diff --git a/trunk/drivers/net/phy/smsc.c b/trunk/drivers/net/phy/smsc.c
index b1d8ed40ad98..6a901f00ed14 100644
--- a/trunk/drivers/net/phy/smsc.c
+++ b/trunk/drivers/net/phy/smsc.c
@@ -38,7 +38,7 @@
 	(MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4)
 
 
-static int lan83c185_config_intr(struct phy_device *phydev)
+static int smsc_phy_config_intr(struct phy_device *phydev)
 {
 	int rc = phy_write (phydev, MII_LAN83C185_IM,
 			((PHY_INTERRUPT_ENABLED == phydev->interrupts)
@@ -48,16 +48,16 @@ static int lan83c185_config_intr(struct phy_device *phydev)
 	return rc < 0 ? rc : 0;
 }
 
-static int lan83c185_ack_interrupt(struct phy_device *phydev)
+static int smsc_phy_ack_interrupt(struct phy_device *phydev)
 {
 	int rc = phy_read (phydev, MII_LAN83C185_ISF);
 
 	return rc < 0 ? rc : 0;
 }
 
-static int lan83c185_config_init(struct phy_device *phydev)
+static int smsc_phy_config_init(struct phy_device *phydev)
 {
-	return lan83c185_ack_interrupt (phydev);
+	return smsc_phy_ack_interrupt (phydev);
 }
 
 
@@ -73,11 +73,11 @@ static struct phy_driver lan83c185_driver = {
 	/* basic functions */
 	.config_aneg	= genphy_config_aneg,
 	.read_status	= genphy_read_status,
-	.config_init	= lan83c185_config_init,
+	.config_init	= smsc_phy_config_init,
 
 	/* IRQ related */
-	.ack_interrupt	= lan83c185_ack_interrupt,
-	.config_intr	= lan83c185_config_intr,
+	.ack_interrupt	= smsc_phy_ack_interrupt,
+	.config_intr	= smsc_phy_config_intr,
 
 	.driver		= { .owner = THIS_MODULE, }
 };