patch-2.1.121 linux/drivers/scsi/NCR5380.c

Next file: linux/drivers/scsi/README.st
Previous file: linux/drivers/pci/pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.120/linux/drivers/scsi/NCR5380.c linux/drivers/scsi/NCR5380.c
@@ -1628,14 +1628,18 @@
 	NCR5380_local_declare();
 	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
 	unsigned char tmp[3], phase;
-	unsigned char *data, value;
+	unsigned char *data;
 	int len;
 	unsigned long timeout;
 	unsigned long flags;
+#ifdef USLEEP
+	unsigned char value;
+#endif
 
-	 NCR5380_setup(instance);
+	NCR5380_setup(instance);
 
 #ifdef USLEEP
+
 	if (hostdata->selecting) 
 	{
 		goto part2;	/* RvC: sorry prof. Dijkstra, but it keeps the
@@ -2250,8 +2254,8 @@
 	register unsigned char p = *phase;
 	register unsigned char *d = *data;
 	unsigned char tmp;
-	int foo;
 	unsigned long flags;
+	int foo;
 #if defined(REAL_DMA_POLL)
 	int cnt, toPIO;
 	unsigned char saved_data = 0, overrun = 0, residue;

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