patch-2.4.0-test9 linux/drivers/pcmcia/cardbus.c

• Lines: 35
• Date: Mon Sep 18 15:11:51 2000
• Orig file: v2.4.0-test8/linux/drivers/pcmcia/cardbus.c
• Orig date: Tue Sep 5 12:56:51 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/pcmcia/cardbus.c linux/drivers/pcmcia/cardbus.c
@@ -58,11 +58,6 @@
 #include <asm/irq.h>
 #include <asm/io.h>
 
-#ifndef PCMCIA_DEBUG
-#define PCMCIA_DEBUG 1
-#endif
-static int pc_debug = PCMCIA_DEBUG;
-
 #define IN_CARD_SERVICES
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
@@ -73,6 +68,10 @@
 #include "cs_internal.h"
 #include "rsrc_mgr.h"
 
+#ifdef PCMCIA_DEBUG
+static int pc_debug = PCMCIA_DEBUG;
+#endif
+
 /*====================================================================*/
 
 #define FIND_FIRST_BIT(n)	((n) - ((n) & ((n)-1)))
@@ -372,9 +371,9 @@
 void cb_enable(socket_info_t * s)
 {
 	struct pci_dev *dev;
-	u_char i, bus = s->cap.cb_dev->subordinate->number;
+	u_char i;
 
-	DEBUG(0, "cs: cb_enable(bus %d)\n", bus);
+	DEBUG(0, "cs: cb_enable(bus %d)\n", s->cap.cb_dev->subordinate->number);
 
 	/* Configure bridge */
 	cb_release_cis_mem(s);