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/eepro100.c | |
parent | fc21cd552bf7845fd2002e7a090d53ee5d12d335 (diff) | |
parent | d7fb9bcfb29a1cbdbda7006658e76c2d9da0f66f (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/eepro100.c')
-rw-r--r-- | drivers/net/eepro100.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c index 9c06b255694..22e14e3814d 100644 --- a/drivers/net/eepro100.c +++ b/drivers/net/eepro100.c @@ -321,7 +321,8 @@ static int set_phyreg (struct eth_device *dev, unsigned char addr, /* Check if given phyaddr is valid, i.e. there is a PHY connected. * Do this by checking model value field from ID2 register. */ -static struct eth_device* verify_phyaddr (char *devname, unsigned char addr) +static struct eth_device* verify_phyaddr (const char *devname, + unsigned char addr) { struct eth_device *dev; unsigned short value; @@ -350,7 +351,7 @@ static struct eth_device* verify_phyaddr (char *devname, unsigned char addr) return dev; } -static int eepro100_miiphy_read (char *devname, unsigned char addr, +static int eepro100_miiphy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value) { struct eth_device *dev; @@ -367,7 +368,7 @@ static int eepro100_miiphy_read (char *devname, unsigned char addr, return 0; } -static int eepro100_miiphy_write (char *devname, unsigned char addr, +static int eepro100_miiphy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value) { struct eth_device *dev; |