patch-2.0.34 linux/drivers/net/auto_irq.c

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

diff -u --recursive --new-file v2.0.33/linux/drivers/net/auto_irq.c linux/drivers/net/auto_irq.c
@@ -39,7 +39,7 @@
 #include <asm/irq.h>
 #include <linux/netdevice.h>
 
-struct device *irq2dev_map[16] = {0, 0, /* ... zeroed */};
+struct device *irq2dev_map[NR_IRQS] = {0, 0, /* ... zeroed */};
 
 unsigned long irqs_busy = 0x2147;		/* The set of fixed IRQs (keyboard, timer, etc) */
 unsigned long irqs_used = 0x0001;		/* The set of fixed IRQs sometimes enabled. */
@@ -65,8 +65,8 @@
 int autoirq_setup(int waittime)
 {
 	int i;
-	int timeout = jiffies + waittime;
-	int boguscount = (waittime*loops_per_sec) / 100;
+	unsigned long timeout = jiffies + waittime;
+	unsigned long boguscount = (waittime*loops_per_sec) / 100;
 
 	irq_handled = 0;
 	irq_bitmap = 0;
@@ -93,8 +93,8 @@
 int autoirq_report(int waittime)
 {
 	int i;
-	int timeout = jiffies+waittime;
-	int boguscount = (waittime*loops_per_sec) / 100;
+	unsigned long timeout = jiffies+waittime;
+	unsigned long boguscount = (waittime*loops_per_sec) / 100;
 
 	/* Hang out at least <waittime> jiffies waiting for the IRQ. */
 

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