aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/sc/card.h2
-rw-r--r--drivers/isdn/sc/command.c2
-rw-r--r--drivers/isdn/sc/timer.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/sc/card.h b/drivers/isdn/sc/card.h
index 4fbfa825c3a2..5992f63c383e 100644
--- a/drivers/isdn/sc/card.h
+++ b/drivers/isdn/sc/card.h
@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int procid, unsigned int type,
125int receivemessage(int card, RspMessage *rspmsg); 125int receivemessage(int card, RspMessage *rspmsg);
126int sc_ioctl(int card, scs_ioctl *data); 126int sc_ioctl(int card, scs_ioctl *data);
127int setup_buffers(int card, int c); 127int setup_buffers(int card, int c);
128void check_reset(unsigned long data); 128void sc_check_reset(unsigned long data);
129void check_phystat(unsigned long data); 129void check_phystat(unsigned long data);
130 130
131#endif /* CARD_H */ 131#endif /* CARD_H */
diff --git a/drivers/isdn/sc/command.c b/drivers/isdn/sc/command.c
index b7bb7cbcf503..0e4969c2ef95 100644
--- a/drivers/isdn/sc/command.c
+++ b/drivers/isdn/sc/command.c
@@ -344,7 +344,7 @@ int reset(int card)
344 344
345 spin_lock_irqsave(&sc_adapter[card]->lock, flags); 345 spin_lock_irqsave(&sc_adapter[card]->lock, flags);
346 init_timer(&sc_adapter[card]->reset_timer); 346 init_timer(&sc_adapter[card]->reset_timer);
347 sc_adapter[card]->reset_timer.function = check_reset; 347 sc_adapter[card]->reset_timer.function = sc_check_reset;
348 sc_adapter[card]->reset_timer.data = card; 348 sc_adapter[card]->reset_timer.data = card;
349 sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; 349 sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME;
350 add_timer(&sc_adapter[card]->reset_timer); 350 add_timer(&sc_adapter[card]->reset_timer);
diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index cc1b8861be2a..91fbe0dc28ec 100644
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -43,7 +43,7 @@ static void setup_ports(int card)
43 * Then, check to see if the signate has been set. Next, set the 43 * Then, check to see if the signate has been set. Next, set the
44 * signature to a known value and issue a startproc if needed. 44 * signature to a known value and issue a startproc if needed.
45 */ 45 */
46void check_reset(unsigned long data) 46void sc_check_reset(unsigned long data)
47{ 47{
48 unsigned long flags; 48 unsigned long flags;
49 unsigned long sig; 49 unsigned long sig;