diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-11-11 23:10:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-11-11 23:10:34 +0100 |
| commit | 4f127980e0d4ba179b4628ebf8e8642210731055 (patch) | |
| tree | 5748931e40e1f7ed26817f26326e5f8c386d9a4f /drivers/net/cs8900.c | |
| parent | a9e9d69dd8849aa230fab88a7f3f4435713763af (diff) | |
| parent | 651ef90fa6ca824c8e581aeef9e04bbbe7f7e9ce (diff) | |
| download | u-boot-imx-4f127980e0d4ba179b4628ebf8e8642210731055.zip u-boot-imx-4f127980e0d4ba179b4628ebf8e8642210731055.tar.gz u-boot-imx-4f127980e0d4ba179b4628ebf8e8642210731055.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
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); |