Merge branch 'master' into for_paulus

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

diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
index e5e164aca7faf7d46aa9f05291e715da334adbe6..bef7963cdd022ebca70e7458621f1f317c401014 100644 (file)
--- a/drivers/isdn/sc/interrupt.c
+++ b/drivers/isdn/sc/interrupt.c
@@ -21,17 +21,7 @@
 #include "card.h"
 #include <linux/interrupt.h>
 
-extern int indicate_status(int, int, ulong, char *);
-extern void check_phystat(unsigned long);
-extern int receivemessage(int, RspMessage *);
-extern int sendmessage(int, unsigned int, unsigned int, unsigned int,
-        unsigned int, unsigned int, unsigned int, unsigned int *);
-extern void rcvpkt(int, RspMessage *);
-
-extern int cinst;
-extern board *sc_adapter[];
-
-int get_card_from_irq(int irq)
+static int get_card_from_irq(int irq)
 {
        int i;
 
@@ -45,7 +35,7 @@ int get_card_from_irq(int irq)
 /*
  * 
  */
-irqreturn_t interrupt_handler(int interrupt, void *cardptr, struct pt_regs *regs)
+irqreturn_t interrupt_handler(int interrupt, void *cardptr)
 {
 
        RspMessage rcvmsg;
@@ -91,7 +81,7 @@ irqreturn_t interrupt_handler(int interrupt, void *cardptr, struct pt_regs *regs
                 */
                if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read))
                {
-                       pr_debug("%s: Received packet 0x%x bytes long at 0x%x\n",
+                       pr_debug("%s: Received packet 0x%x bytes long at 0x%lx\n",
                                                sc_adapter[card]->devicename,
                                                rcvmsg.msg_data.response.msg_len,
                                                rcvmsg.msg_data.response.buff_offset);