diff --git a/[refs] b/[refs] index feeeb0f59e6f..724427b9b457 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1789a640f55658d9a54c1868cc3405e4d85dbd8e +refs/heads/master: fa6ca57113c2fd2d86dd854e0bc5e18b9786282b diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c index 3a029d02c2b4..4d09eab3548e 100644 --- a/trunk/drivers/net/greth.c +++ b/trunk/drivers/net/greth.c @@ -1555,7 +1555,6 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev } /* setup NAPI */ - memset(&greth->napi, 0, sizeof(greth->napi)); netif_napi_add(dev, &greth->napi, greth_poll, 64); return 0;