Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / isdn / sc / timer.c

diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c
index aced19aac5a2e5011d81cb4f03ef6805836e5d62..91fbe0dc28ec75a655b68b31fbe69c8241c3563b 100644 (file)
--- a/drivers/isdn/sc/timer.c
+++ b/drivers/isdn/sc/timer.c
@@ -20,14 +20,6 @@
 #include "message.h"
 #include "card.h"
 
-extern board *sc_adapter[];
-
-extern void flushreadfifo(int);
-extern int  startproc(int);
-extern int  indicate_status(int, int, unsigned long, char *);
-extern int  sendmessage(int, unsigned int, unsigned int, unsigned int,
-        unsigned int, unsigned int, unsigned int, unsigned int *);
-
 
 /*
  * Write the proper values into the I/O ports following a reset
@@ -51,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;
@@ -76,7 +68,7 @@ void check_reset(unsigned long data)
                if (sc_adapter[card]->StartOnReset)
                        startproc(card);
        } else  {
-               pr_debug("%s: No signature yet, waiting another %d jiffies.\n", 
+               pr_debug("%s: No signature yet, waiting another %lu jiffies.\n",
                        sc_adapter[card]->devicename, CHECKRESET_TIME);
                mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME);
                spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);