From f0d349888f9fa5c53e825e42753b872e1b8c9872 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@sw.ru>
Date: Thu, 19 Jul 2007 01:49:10 -0700
Subject: [PATCH] --- yaml --- r: 61649 b: refs/heads/master c:
 e3aded3cc289113c7bc729ef4cb75e56d9aa71be h: refs/heads/master i:   61647:
 bf864379817f1be85ea4700b346b3b50103ea426 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/isdn/sc/card.h    | 2 +-
 trunk/drivers/isdn/sc/command.c | 2 +-
 trunk/drivers/isdn/sc/timer.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 24055471938e..6da88d10a39c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ac674f52778b95450509357435320be1d795248
+refs/heads/master: e3aded3cc289113c7bc729ef4cb75e56d9aa71be
diff --git a/trunk/drivers/isdn/sc/card.h b/trunk/drivers/isdn/sc/card.h
index 4fbfa825c3a2..5992f63c383e 100644
--- a/trunk/drivers/isdn/sc/card.h
+++ b/trunk/drivers/isdn/sc/card.h
@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int procid, unsigned int type,
 int receivemessage(int card, RspMessage *rspmsg);
 int sc_ioctl(int card, scs_ioctl *data);
 int setup_buffers(int card, int c);
-void check_reset(unsigned long data);
+void sc_check_reset(unsigned long data);
 void check_phystat(unsigned long data);
 
 #endif /* CARD_H */
diff --git a/trunk/drivers/isdn/sc/command.c b/trunk/drivers/isdn/sc/command.c
index b7bb7cbcf503..0e4969c2ef95 100644
--- a/trunk/drivers/isdn/sc/command.c
+++ b/trunk/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);
diff --git a/trunk/drivers/isdn/sc/timer.c b/trunk/drivers/isdn/sc/timer.c
index cc1b8861be2a..91fbe0dc28ec 100644
--- a/trunk/drivers/isdn/sc/timer.c
+++ b/trunk/drivers/isdn/sc/timer.c
@@ -43,7 +43,7 @@ static void setup_ports(int card)
  * Then, check to see if the signate has been set. Next, set the
  * signature to a known value and issue a startproc if needed.
  */
-void check_reset(unsigned long data)
+void sc_check_reset(unsigned long data)
 {
 	unsigned long flags;
 	unsigned long sig;