diff options
| author | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-11 16:52:59 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-11 16:52:59 +1000 |
| commit | c1561cf463f4a480d1960e833c8fe628207b24e4 (patch) | |
| tree | b612e5257611ef33196aacc00fba813c943384d5 /drivers/net/mv643xx_eth.c | |
| parent | 053c59a0a7234bac669992f5b8b933b7d7fc189d (diff) | |
| parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) | |
| download | op-kernel-dev-c1561cf463f4a480d1960e833c8fe628207b24e4.zip op-kernel-dev-c1561cf463f4a480d1960e833c8fe628207b24e4.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 34288fe..3153356 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -1357,7 +1357,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) #endif dev->watchdog_timeo = 2 * HZ; - dev->tx_queue_len = mp->tx_ring_size; dev->base_addr = 0; dev->change_mtu = mv643xx_eth_change_mtu; dev->do_ioctl = mv643xx_eth_do_ioctl; |
