diff options
| author | TsiChungLiew <Tsi-Chung.Liew@freescale.com> | 2007-08-05 03:30:44 -0500 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-08 09:47:10 +0200 |
| commit | 9e737d8476e7d6a596d16caaf6a3853a9a1190a2 (patch) | |
| tree | 67aa82caa5daf70c8e76ef75e4b4d1ecc5a5d656 | |
| parent | 9998bd37ead85e93953559720710d3b0685c81e6 (diff) | |
| download | talos-obmc-uboot-9e737d8476e7d6a596d16caaf6a3853a9a1190a2.tar.gz talos-obmc-uboot-9e737d8476e7d6a596d16caaf6a3853a9a1190a2.zip | |
Declared attributes of void __mii_init(void) as an alias for int mii_init(void)
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| -rw-r--r-- | board/freescale/m5329evb/mii.c | 4 | ||||
| -rw-r--r-- | drivers/net/mcffec.c | 2 | ||||
| -rw-r--r-- | include/common.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/board/freescale/m5329evb/mii.c b/board/freescale/m5329evb/mii.c index 691b14459b..68dc04fd9a 100644 --- a/board/freescale/m5329evb/mii.c +++ b/board/freescale/m5329evb/mii.c @@ -203,7 +203,9 @@ int mii_discover_phy(struct eth_device *dev) } #endif /* CFG_DISCOVER_PHY */ -void mii_init(void) +int mii_init(void) __attribute__((weak,alias("__mii_init"))); + +void __mii_init(void) { volatile fec_t *fecp; struct fec_info_s *info; diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 11f6721897..fde1aaecb6 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -101,7 +101,7 @@ void fec_reset(struct eth_device *dev); extern int fecpin_setclear(struct eth_device *dev, int setclear); #ifdef CFG_DISCOVER_PHY -extern void mii_init(void); +extern void __mii_init(void); extern uint mii_send(uint mii_cmd); extern int mii_discover_phy(struct eth_device *dev); extern int mcffec_miiphy_read(char *devname, unsigned char addr, diff --git a/include/common.h b/include/common.h index 23f93907ee..a1a329071a 100644 --- a/include/common.h +++ b/include/common.h @@ -539,7 +539,7 @@ ulong bootcount_load (void); #define BOOTCOUNT_MAGIC 0xB001C041 /* $(CPU)/.../<eth> */ -void mii_init (void); +/*void mii_init (void);*/ /* $(CPU)/.../lcd.c */ ulong lcd_setmem (ulong); |
