Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-05-26 21:33:55 -04:00
commit f29cb26c43
1 changed files with 0 additions and 2 deletions

View File

@ -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