--- zzzz-none-000/linux-2.6.13.1/drivers/isdn/capi/kcapi.c	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/drivers/isdn/capi/kcapi.c	2007-08-17 12:10:39.000000000 +0000
@@ -1,10 +1,10 @@
 /* $Id: kcapi.c,v 1.1.2.8 2004/03/26 19:57:20 armin Exp $
- * 
+ *
  * Kernel CAPI 2.0 Module
- * 
+ *
  * Copyright 1999 by Carsten Paeth <calle@calle.de>
  * Copyright 2002 by Kai Germaschewski <kai@germaschewski.name>
- * 
+ *
  * This software may be used and distributed according to the terms
  * of the GNU General Public License, incorporated herein by reference.
  *
@@ -33,6 +33,13 @@
 #include <linux/b1lli.h>
 #endif
 
+#ifdef CONFIG_NO_PRINTK
+#define printk  __printk
+#endif
+
+#undef printk
+#define printk(...)
+
 static char *revision = "$Revision: 1.1.2.8 $";
 
 /* ------------------------------------------------------------- */
@@ -160,7 +167,7 @@
 static void release_appl(struct capi_ctr *card, u16 applid)
 {
 	DBG("applid %#x", applid);
-	
+
 	card->release_appl(card, applid);
 	capi_ctr_put(card);
 }
@@ -244,7 +251,7 @@
 	return 0;
 }
 
-	
+
 /* -------- Receiver ------------------------------------------ */
 
 static void recv_handler(void *_ap)
@@ -420,13 +427,17 @@
 	card->traceflag = showcapimsgs;
 
 	sprintf(card->procfn, "capi/controllers/%d", card->cnr);
+#if defined(CONFIG_PROC_FS)
 	card->procent = create_proc_entry(card->procfn, 0, NULL);
 	if (card->procent) {
-	   card->procent->read_proc = 
+	   card->procent->read_proc =
 		(int (*)(char *,char **,off_t,int,int *,void *))
 			card->ctr_read_proc;
 	   card->procent->data = card;
 	}
+#else /*--- #if defined(CONFIG_PROC_FS) ---*/
+    card->procent = NULL;
+#endif /*--- #if defined(CONFIG_PROC_FS) ---*/
 
 	ncards++;
 	printk(KERN_NOTICE "kcapi: Controller %d: %s attached\n",
@@ -443,10 +454,12 @@
 
 	ncards--;
 
+#if defined(CONFIG_PROC_FS)
 	if (card->procent) {
 	   remove_proc_entry(card->procfn, NULL);
 	   card->procent = NULL;
 	}
+#endif /*--- #if defined(CONFIG_PROC_FS) ---*/
 	capi_cards[card->cnr - 1] = NULL;
 	printk(KERN_NOTICE "kcapi: Controller %d: %s unregistered\n",
 			card->cnr, card->name);
@@ -530,7 +543,7 @@
 	ap->release_in_progress = 0;
 
 	write_unlock_irqrestore(&application_lock, flags);
-	
+
 	down(&controller_sem);
 	for (i = 0; i < CAPI_MAXCONTR; i++) {
 		if (!capi_cards[i] || capi_cards[i]->cardstate != CARD_RUNNING)
@@ -587,7 +600,7 @@
 	u8 cmd, subcmd;
 
 	DBG("applid %#x", ap->applid);
- 
+
 	if (ncards == 0)
 		return CAPI_REGNOTINSTALLED;
 	if ((ap->applid == 0) || ap->release_in_progress)
@@ -599,7 +612,7 @@
 	card = get_capi_ctr_by_nr(CAPIMSG_CONTROLLER(skb->data));
 	if (!card || card->cardstate != CARD_RUNNING) {
 		card = get_capi_ctr_by_nr(1); // XXX why?
-	        if (!card || card->cardstate != CARD_RUNNING) 
+	        if (!card || card->cardstate != CARD_RUNNING)
 			return CAPI_REGNOTINSTALLED;
 	}
 	if (card->blocked)
@@ -646,7 +659,7 @@
 		return CAPI_NOERROR;
 	}
 	card = get_capi_ctr_by_nr(contr);
-	if (!card || card->cardstate != CARD_RUNNING) 
+	if (!card || card->cardstate != CARD_RUNNING)
 		return CAPI_REGNOTINSTALLED;
 	strlcpy(buf, card->manu, CAPI_MANUFACTURER_LEN);
 	return CAPI_NOERROR;
@@ -663,7 +676,7 @@
 		return CAPI_NOERROR;
 	}
 	card = get_capi_ctr_by_nr(contr);
-	if (!card || card->cardstate != CARD_RUNNING) 
+	if (!card || card->cardstate != CARD_RUNNING)
 		return CAPI_REGNOTINSTALLED;
 
 	memcpy((void *) verp, &card->version, sizeof(capi_version));
@@ -681,7 +694,7 @@
 		return CAPI_NOERROR;
 	}
 	card = get_capi_ctr_by_nr(contr);
-	if (!card || card->cardstate != CARD_RUNNING) 
+	if (!card || card->cardstate != CARD_RUNNING)
 		return CAPI_REGNOTINSTALLED;
 
 	strlcpy((void *) serial, card->serial, CAPI_SERIAL_LEN);
@@ -699,7 +712,7 @@
 		return CAPI_NOERROR;
 	}
 	card = get_capi_ctr_by_nr(contr);
-	if (!card || card->cardstate != CARD_RUNNING) 
+	if (!card || card->cardstate != CARD_RUNNING)
 		return CAPI_REGNOTINSTALLED;
 
 	memcpy((void *) profp, &card->profile,