aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-26 21:33:55 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-26 21:33:55 -0400
commitf29cb26c43d7c064421e76540b7654fbba9efc78 (patch)
treede6a1c292e4e5be0ebedc21cae6130a421c8590f /drivers/net
parent6d0c07cc6eec4636d83dd75c85b3205229f1960a (diff)
parenta24b163b7c16f9e30e726319115e45ed6e683582 (diff)
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/pcnet32.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 07c31f19c6b..fc08c4af506 100644
--- 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