Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[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 8631d338d69ab550084ad4e3d0eaaebacd206b6c..cd17de18cb76df0907659168e516bdb8d3bcc502 100644 (file)
--- a/drivers/isdn/sc/interrupt.c
+++ b/drivers/isdn/sc/interrupt.c
@@ -45,7 +45,7 @@ static 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 +91,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);