patch-2.1.113 linux/drivers/scsi/amiga7xx.c

• Lines: 40
• Date: Thu Jul 30 11:17:10 1998
• Orig file: v2.1.112/linux/drivers/scsi/amiga7xx.c
• Orig date: Fri May 8 23:14:49 1998

diff -u --recursive --new-file v2.1.112/linux/drivers/scsi/amiga7xx.c linux/drivers/scsi/amiga7xx.c
@@ -33,14 +33,17 @@
     S_IFDIR | S_IRUGO | S_IXUGO, 2
 };
 
+extern ncr53c7xx_init (Scsi_Host_Template *tpnt, int board, int chip, 
+		       u32 base, int io_port, int irq, int dma,
+		       long long options, int clock);
+
 int amiga7xx_detect(Scsi_Host_Template *tpnt)
 {
     static unsigned char called = 0;
     unsigned int key;
-    int num = 0;
-    unsigned long address;
+    int num = 0, clock;
     long long options;
-    struct ConfigDev *cd;
+    const struct ConfigDev *cd;
 
     if (called || !MACH_IS_AMIGA)
 	return 0;
@@ -50,6 +53,7 @@
 #ifdef CONFIG_WARPENGINE_SCSI
     if ((key = zorro_find(ZORRO_PROD_MACROSYSTEMS_WARP_ENGINE_40xx, 0, 0)))
     {
+	unsigned long address;
 	cd = zorro_get_board(key);
 	address = (unsigned long)kernel_map((unsigned long)cd->cd_BoardAddr,
 		cd->cd_BoardSize, KERNELMAP_NOCACHE_SER, NULL);
@@ -83,8 +87,9 @@
 
 #ifdef CONFIG_A4091_SCSI
     while ( (key = zorro_find(ZORRO_PROD_CBM_A4091_1, 0, 0)) ||
-	 (key = zorro_find(ZORRO_PROD_CBM_A4091_2, 0, 0)) )
+	    (key = zorro_find(ZORRO_PROD_CBM_A4091_2, 0, 0)) )
     {
+	unsigned long address;
 	cd = zorro_get_board(key);
 	address = (unsigned long)kernel_map((unsigned long)cd->cd_BoardAddr,
 		cd->cd_BoardSize, KERNELMAP_NOCACHE_SER, NULL);