diff --git a/[refs] b/[refs] index 65d48b366d2a..6e6e24944fb2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 079ceb44e9b3432fb8e8f7d08207faae69407c89 +refs/heads/master: 8462d14e471fc5761e37d1b89282966a5b504468 diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c index 6bd03c8b8886..ad1bc7317df6 100644 --- a/trunk/drivers/net/ethoc.c +++ b/trunk/drivers/net/ethoc.c @@ -1040,7 +1040,6 @@ static int ethoc_probe(struct platform_device *pdev) netdev->features |= 0; /* setup NAPI */ - memset(&priv->napi, 0, sizeof(priv->napi)); netif_napi_add(netdev, &priv->napi, ethoc_poll, 64); spin_lock_init(&priv->rx_lock);