diff options
author | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:57:54 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-08-10 22:57:54 +0200 |
commit | 42441b8a1a3e8b42459de60bbec6833a31cd6cd5 (patch) | |
tree | ceaa454a2a57fff3c3a64bf6f1637d61eb54672e /drivers/net/tsec.c | |
parent | fc21cd552bf7845fd2002e7a090d53ee5d12d335 (diff) | |
parent | d7fb9bcfb29a1cbdbda7006658e76c2d9da0f66f (diff) | |
download | u-boot-imx-42441b8a1a3e8b42459de60bbec6833a31cd6cd5.zip u-boot-imx-42441b8a1a3e8b42459de60bbec6833a31cd6cd5.tar.gz u-boot-imx-42441b8a1a3e8b42459de60bbec6833a31cd6cd5.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/tsec.c')
-rw-r--r-- | drivers/net/tsec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 54c4a70..9b5dd92 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -60,9 +60,9 @@ static void phy_run_commands(struct tsec_private *priv, struct phy_cmd *cmd); static void adjust_link(struct eth_device *dev); #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) \ && !defined(BITBANGMII) -static int tsec_miiphy_write(char *devname, unsigned char addr, +static int tsec_miiphy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value); -static int tsec_miiphy_read(char *devname, unsigned char addr, +static int tsec_miiphy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value); #endif #ifdef CONFIG_MCAST_TFTP @@ -1919,7 +1919,7 @@ static void phy_run_commands(struct tsec_private *priv, struct phy_cmd *cmd) * Returns: * 0 on success */ -static int tsec_miiphy_read(char *devname, unsigned char addr, +static int tsec_miiphy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value) { unsigned short ret; @@ -1942,7 +1942,7 @@ static int tsec_miiphy_read(char *devname, unsigned char addr, * Returns: * 0 on success */ -static int tsec_miiphy_write(char *devname, unsigned char addr, +static int tsec_miiphy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value) { struct tsec_private *priv = privlist[0]; |