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/4xx_enet.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/4xx_enet.c')
| -rw-r--r-- | drivers/net/4xx_enet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 144b851..d9487ad 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -305,9 +305,9 @@ static void mal_err (struct eth_device *dev, unsigned long isr, static void emac_err (struct eth_device *dev, unsigned long isr); extern int phy_setup_aneg (char *devname, unsigned char addr); -extern int emac4xx_miiphy_read (char *devname, unsigned char addr, +extern int emac4xx_miiphy_read (const char *devname, unsigned char addr, unsigned char reg, unsigned short *value); -extern int emac4xx_miiphy_write (char *devname, unsigned char addr, +extern int emac4xx_miiphy_write (const char *devname, unsigned char addr, unsigned char reg, unsigned short value); int board_emac_count(void); |