patch-2.4.0-test9 linux/drivers/scsi/pci2220i.c

• Lines: 20
• Date: Mon Sep 18 13:36:25 2000
• Orig file: v2.4.0-test8/linux/drivers/scsi/pci2220i.c
• Orig date: Mon Jun 19 13:42:40 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/scsi/pci2220i.c linux/drivers/scsi/pci2220i.c
@@ -2509,7 +2509,7 @@
 	init_timer (&padapter->reconTimer);
 	padapter->reconTimer.function = ReconTimerExpiry;
 	padapter->reconTimer.data = (unsigned long)padapter;
-	printk("\nPCI-%sI EIDE CONTROLLER: at I/O = %lX/%lX  IRQ = %ld\n", str, padapter->basePort, padapter->regBase, irq);
+	printk("\nPCI-%sI EIDE CONTROLLER: at I/O = %lX/%lX  IRQ = %d\n", str, padapter->basePort, padapter->regBase, irq);
 	printk("Version %s, Compiled %s %s\n\n", PCI2220I_VERSION, __DATE__, __TIME__);
 	}	
 /****************************************************************
@@ -2920,9 +2920,7 @@
 	}
 
 
-#ifdef MODULE
 /* Eventually this will go into an include file, but this will be later */
-Scsi_Host_Template driver_template = PCI2220I;
+static Scsi_Host_Template driver_template = PCI2220I;
 
 #include "scsi_module.c"
-#endif