diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /drivers/net/mv643xx_eth.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 2d488abcf62d..dd2b6a71c6d7 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -2901,7 +2901,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev) | |||
| 2901 | mp->dev = dev; | 2901 | mp->dev = dev; |
| 2902 | 2902 | ||
| 2903 | set_params(mp, pd); | 2903 | set_params(mp, pd); |
| 2904 | dev->real_num_tx_queues = mp->txq_count; | 2904 | netif_set_real_num_tx_queues(dev, mp->txq_count); |
| 2905 | netif_set_real_num_rx_queues(dev, mp->rxq_count); | ||
| 2905 | 2906 | ||
| 2906 | if (pd->phy_addr != MV643XX_ETH_PHY_NONE) | 2907 | if (pd->phy_addr != MV643XX_ETH_PHY_NONE) |
| 2907 | mp->phy = phy_scan(mp, pd->phy_addr); | 2908 | mp->phy = phy_scan(mp, pd->phy_addr); |