diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-11-15 23:13:40 +0100 |
| commit | 06f43286c6354aaab0103615e83893512f86eee7 (patch) | |
| tree | c0c6bc4819fa381a9e1a2a051492eb4813bd410b /drivers/net/cs8900.c | |
| parent | c758e947aa7d39a2be607ecdedd818ad300807b2 (diff) | |
| parent | 3c014f1586d5bfe30dca7549396915c83f31cd30 (diff) | |
| download | u-boot-imx-06f43286c6354aaab0103615e83893512f86eee7.zip u-boot-imx-06f43286c6354aaab0103615e83893512f86eee7.tar.gz u-boot-imx-06f43286c6354aaab0103615e83893512f86eee7.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/cs8900.c')
| -rw-r--r-- | drivers/net/cs8900.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 587f7f6..df36004 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -56,7 +56,7 @@ #define REG_READ(a) readl((a)) /* we don't need 16 bit initialisation on 32 bit bus */ -#define get_reg_init_bus(x) get_reg((x)) +#define get_reg_init_bus(r,d) get_reg((r),(d)) #else @@ -321,15 +321,16 @@ int cs8900_initialize(u8 dev_num, int base_addr) memset(priv, 0, sizeof(*priv)); priv->regs = (struct cs8900_regs *)base_addr; - /* Load MAC address from EEPROM */ - cs8900_get_enetaddr(dev); - dev->iobase = base_addr; dev->priv = priv; dev->init = cs8900_init; dev->halt = cs8900_halt; dev->send = cs8900_send; dev->recv = cs8900_recv; + + /* Load MAC address from EEPROM */ + cs8900_get_enetaddr(dev); + sprintf(dev->name, "%s-%hu", CS8900_DRIVERNAME, dev_num); eth_register(dev); |