Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux

[~andy/linux] / drivers / isdn / sc / command.c

diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c
index b7bb7cbcf5035bf4bcb14bede0bbd84cc05c2e30..0e4969c2ef951b991a0424db1420a794a61fd461 100644 (file)
--- a/drivers/isdn/sc/command.c
+++ b/drivers/isdn/sc/command.c
@@ -344,7 +344,7 @@ int reset(int card)
 
        spin_lock_irqsave(&sc_adapter[card]->lock, flags);
        init_timer(&sc_adapter[card]->reset_timer);
-       sc_adapter[card]->reset_timer.function = check_reset;
+       sc_adapter[card]->reset_timer.function = sc_check_reset;
        sc_adapter[card]->reset_timer.data = card;
        sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME;
        add_timer(&sc_adapter[card]->reset_timer);