Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[mirror_ubuntu-disco-kernel.git] / drivers / atm / idt77105.c

diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 57af9fd198e4e756b4646e5153f3f51b6b741626..909744eb7bab419eec2dc71e2c79c87231812ce3 100644 (file)
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -306,11 +306,9 @@ static int idt77105_start(struct atm_dev *dev)
        if (start_timer) {
                start_timer = 0;
                 
-               setup_timer(&stats_timer, idt77105_stats_timer_func, 0UL);
                stats_timer.expires = jiffies+IDT77105_STATS_TIMER_PERIOD;
                add_timer(&stats_timer);
                 
-               setup_timer(&restart_timer, idt77105_restart_timer_func, 0UL);
                restart_timer.expires = jiffies+IDT77105_RESTART_TIMER_PERIOD;
                add_timer(&restart_timer);
        }