patch-2.1.110 linux/drivers/net/ne2k-pci.c

Next file: linux/drivers/net/sk_g16.c
Previous file: linux/drivers/net/ne.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.109/linux/drivers/net/ne2k-pci.c linux/drivers/net/ne2k-pci.c
@@ -45,7 +45,7 @@
 #include "8390.h"
 
 /* Set statically or when loading the driver module. */
-static debug = 1;
+static int debug = 1;
 
 /* Some defines that people can play with if so inclined. */
 
@@ -446,7 +446,7 @@
 	/* This *shouldn't* happen. If it does, it's the last thing you'll see */
 	if (ei_status.dmaing) {
 		printk("%s: DMAing conflict in ne2k_pci_get_8390_hdr "
-			   "[DMAstat:%d][irqlock:%d][intr:%d].\n",
+			   "[DMAstat:%d][irqlock:%d][intr:%ld].\n",
 			   dev->name, ei_status.dmaing, ei_status.irqlock,
 			   dev->interrupt);
 		return;
@@ -484,7 +484,7 @@
 	/* This *shouldn't* happen. If it does, it's the last thing you'll see */
 	if (ei_status.dmaing) {
 		printk("%s: DMAing conflict in ne2k_pci_block_input "
-			   "[DMAstat:%d][irqlock:%d][intr:%d].\n",
+			   "[DMAstat:%d][irqlock:%d][intr:%ld].\n",
 			   dev->name, ei_status.dmaing, ei_status.irqlock,
 			   dev->interrupt);
 		return;
@@ -532,7 +532,7 @@
 	/* This *shouldn't* happen. If it does, it's the last thing you'll see */
 	if (ei_status.dmaing) {
 		printk("%s: DMAing conflict in ne2k_pci_block_output."
-			   "[DMAstat:%d][irqlock:%d][intr:%d]\n",
+			   "[DMAstat:%d][irqlock:%d][intr:%ld]\n",
 			   dev->name, ei_status.dmaing, ei_status.irqlock,
 			   dev->interrupt);
 		return;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov