Merge branch 'upstream-fixes' into upstream

2006-05-26 21:33:55 -04:00 · 2006-05-26 21:33:55 -04:00 · f29cb26c43
parent 6d0c07cc6e a24b163b7c
commit f29cb26c43
1 changed files with 0 additions and 2 deletions
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@ -1774,8 +1774,6 @@ static int pcnet32_open(struct net_device *dev)
 		lp->rx_dma_addr[i] = 0;
 	}

-	pcnet32_free_ring(dev);
-
 	/*
 	 * Switch back to 16bit mode to avoid problems with dumb
 	 * DOS packet driver after a warm reboot