diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:08:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:08:05 +0200 |
| commit | ae37a0704a8a27e47471f541a68b88370cd14aa8 (patch) | |
| tree | e591e61ff80c3ea1961b37c96e3ad161c8a1f0af /drivers/net/davinci_emac.c | |
| parent | 18a056a18f6294a88c34105efcabf4c0638a946b (diff) | |
| parent | dc41b8bf3df2b2c3bd833f871d88ff5ef40a19f3 (diff) | |
| download | u-boot-imx-ae37a0704a8a27e47471f541a68b88370cd14aa8.zip u-boot-imx-ae37a0704a8a27e47471f541a68b88370cd14aa8.tar.gz u-boot-imx-ae37a0704a8a27e47471f541a68b88370cd14aa8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'drivers/net/davinci_emac.c')
| -rw-r--r-- | drivers/net/davinci_emac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 02bbb8c..41a9910 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -252,12 +252,12 @@ static int gen_auto_negotiate(int phy_addr) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) -static int davinci_mii_phy_read(char *devname, unsigned char addr, unsigned char reg, unsigned short *value) +static int davinci_mii_phy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value) { return(davinci_eth_phy_read(addr, reg, value) ? 0 : 1); } -static int davinci_mii_phy_write(char *devname, unsigned char addr, unsigned char reg, unsigned short value) +static int davinci_mii_phy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value) { return(davinci_eth_phy_write(addr, reg, value) ? 0 : 1); } |