diff --git a/[refs] b/[refs] index ab4f69ef36e5..72e7d387e7d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebc71647309539aaf9088f4e41b9f364cce8f7eb +refs/heads/master: 11913d30b9fb985b12835037281ae0483be59623 diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c index c63f484f9072..92e0eb95ff8c 100644 --- a/trunk/drivers/net/sis190.c +++ b/trunk/drivers/net/sis190.c @@ -1041,8 +1041,6 @@ static int sis190_open(struct net_device *dev) if (rc < 0) goto err_free_rx_1; - INIT_WORK(&tp->phy_task, sis190_phy_task); - sis190_request_timer(dev); rc = request_irq(dev->irq, sis190_interrupt, IRQF_SHARED, dev->name, dev);