From 1fb776998ea082ac87b1fe41a8950d7a0392dd36 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 3 Oct 2006 01:16:15 -0700
Subject: [PATCH] --- yaml --- r: 38141 b: refs/heads/master c:
 3879b6b6a8ee39b50559b2c2dd083c557d39e0f8 h: refs/heads/master i:   38139:
 7289d19ee52594841eb670ca8faa88b4857fcf67 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/isdn/sc/event.c     | 2 ++
 trunk/drivers/isdn/sc/interrupt.c | 2 +-
 trunk/drivers/isdn/sc/timer.c     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa5c88e9b426..979102afb325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20f43535694bb19e1bb45917b73b7e5cd5d74818
+refs/heads/master: 3879b6b6a8ee39b50559b2c2dd083c557d39e0f8
diff --git a/trunk/drivers/isdn/sc/event.c b/trunk/drivers/isdn/sc/event.c
index 5b8c7c1a7663..57367325ef04 100644
--- a/trunk/drivers/isdn/sc/event.c
+++ b/trunk/drivers/isdn/sc/event.c
@@ -45,8 +45,10 @@ int indicate_status(int card, int event,ulong Channel,char *Data)
 {
 	isdn_ctrl cmd;
 
+#ifdef DEBUG
 	pr_debug("%s: Indicating event %s on Channel %d\n",
 		sc_adapter[card]->devicename, events[event-256], Channel);
+#endif
 	if (Data != NULL){
 		pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename,
 			Data);
diff --git a/trunk/drivers/isdn/sc/interrupt.c b/trunk/drivers/isdn/sc/interrupt.c
index 8631d338d69a..ae6263125ac2 100644
--- a/trunk/drivers/isdn/sc/interrupt.c
+++ b/trunk/drivers/isdn/sc/interrupt.c
@@ -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);
diff --git a/trunk/drivers/isdn/sc/timer.c b/trunk/drivers/isdn/sc/timer.c
index aced19aac5a2..f43282be0ada 100644
--- a/trunk/drivers/isdn/sc/timer.c
+++ b/trunk/drivers/isdn/sc/timer.c
@@ -76,7 +76,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);