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 /arch/powerpc/cpu/mpc8xx/fec.c | |
| parent | 18a056a18f6294a88c34105efcabf4c0638a946b (diff) | |
| parent | dc41b8bf3df2b2c3bd833f871d88ff5ef40a19f3 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'arch/powerpc/cpu/mpc8xx/fec.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/fec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/fec.c b/arch/powerpc/cpu/mpc8xx/fec.c index 89c1ff939d2..d4abeb1b2f1 100644 --- a/arch/powerpc/cpu/mpc8xx/fec.c +++ b/arch/powerpc/cpu/mpc8xx/fec.c @@ -63,9 +63,9 @@ DECLARE_GLOBAL_DATA_PTR; static int mii_discover_phy(struct eth_device *dev); #endif -int fec8xx_miiphy_read(char *devname, unsigned char addr, +int fec8xx_miiphy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value); -int fec8xx_miiphy_write(char *devname, unsigned char addr, +int fec8xx_miiphy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value); static struct ether_fcc_info_s @@ -164,9 +164,9 @@ int fec_initialize(bd_t *bis) /* for FEC1 make sure that the name of the interface is the same as the old one for compatibility reasons */ if (i == 0) { - sprintf (dev->name, "FEC ETHERNET"); + sprintf (dev->name, "FEC"); } else { - sprintf (dev->name, "FEC%d ETHERNET", + sprintf (dev->name, "FEC%d", ether_fcc_info[i].ether_index + 1); } @@ -990,7 +990,7 @@ void mii_init (void) * Otherwise they hang in mii_send() !!! Sorry! *****************************************************************************/ -int fec8xx_miiphy_read(char *devname, unsigned char addr, +int fec8xx_miiphy_read(const char *devname, unsigned char addr, unsigned char reg, unsigned short *value) { short rdreg; /* register working value */ @@ -1007,7 +1007,7 @@ int fec8xx_miiphy_read(char *devname, unsigned char addr, return 0; } -int fec8xx_miiphy_write(char *devname, unsigned char addr, +int fec8xx_miiphy_write(const char *devname, unsigned char addr, unsigned char reg, unsigned short value) { short rdreg; /* register working value */ |