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/4xx_enet.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/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); |