diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:33:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:33:55 -0400 |
| commit | f29cb26c43d7c064421e76540b7654fbba9efc78 (patch) | |
| tree | de6a1c292e4e5be0ebedc21cae6130a421c8590f | |
| parent | 6d0c07cc6eec4636d83dd75c85b3205229f1960a (diff) | |
| parent | a24b163b7c16f9e30e726319115e45ed6e683582 (diff) | |
Merge branch 'upstream-fixes' into upstream
| -rw-r--r-- | drivers/net/pcnet32.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 07c31f19c6ba..fc08c4af506c 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
| @@ -1774,8 +1774,6 @@ static int pcnet32_open(struct net_device *dev) | |||
| 1774 | lp->rx_dma_addr[i] = 0; | 1774 | lp->rx_dma_addr[i] = 0; |
| 1775 | } | 1775 | } |
| 1776 | 1776 | ||
| 1777 | pcnet32_free_ring(dev); | ||
| 1778 | |||
| 1779 | /* | 1777 | /* |
| 1780 | * Switch back to 16bit mode to avoid problems with dumb | 1778 | * Switch back to 16bit mode to avoid problems with dumb |
| 1781 | * DOS packet driver after a warm reboot | 1779 | * DOS packet driver after a warm reboot |