Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  net/4xx: Install interrupt handler after driver registration
This commit is contained in:
Wolfgang Denk 2011-08-02 21:52:21 +02:00
commit 0886eef9ba

View File

@ -2035,6 +2035,13 @@ int ppc_4xx_eth_initialize (bd_t * bis)
dev->send = ppc_4xx_eth_send;
dev->recv = ppc_4xx_eth_rx;
eth_register(dev);
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register(dev->name,
emac4xx_miiphy_read, emac4xx_miiphy_write);
#endif
if (0 == virgin) {
/* set the MAL IER ??? names may change with new spec ??? */
#if defined(CONFIG_440SPE) || \
@ -2072,13 +2079,6 @@ int ppc_4xx_eth_initialize (bd_t * bis)
dev);
virgin = 1;
}
eth_register (dev);
#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
miiphy_register (dev->name,
emac4xx_miiphy_read, emac4xx_miiphy_write);
#endif
} /* end for each supported device */
return 0;