summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-08-12 23:08:05 +0200
committerWolfgang Denk <wd@denx.de>2010-08-12 23:08:05 +0200
commitae37a0704a8a27e47471f541a68b88370cd14aa8 (patch)
treee591e61ff80c3ea1961b37c96e3ad161c8a1f0af /arch/m68k
parent18a056a18f6294a88c34105efcabf4c0638a946b (diff)
parentdc41b8bf3df2b2c3bd833f871d88ff5ef40a19f3 (diff)
downloadu-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 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/fec.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/fec.h b/arch/m68k/include/asm/fec.h
index 49311e5..cecec59 100644
--- a/arch/m68k/include/asm/fec.h
+++ b/arch/m68k/include/asm/fec.h
@@ -357,9 +357,9 @@ int fecpin_setclear(struct eth_device *dev, int setclear);
void __mii_init(void);
uint mii_send(uint mii_cmd);
int mii_discover_phy(struct eth_device *dev);
-int mcffec_miiphy_read(char *devname, unsigned char addr,
+int mcffec_miiphy_read(const char *devname, unsigned char addr,
unsigned char reg, unsigned short *value);
-int mcffec_miiphy_write(char *devname, unsigned char addr,
+int mcffec_miiphy_write(const char *devname, unsigned char addr,
unsigned char reg, unsigned short value);
#endif