summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven2011-06-13 20:39:20 +0200
committerJames Bottomley2011-06-29 22:14:38 +0200
commit0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149 (patch)
tree1850ee01fe461a8e9cda188df8e71e47c2df89d3
parent[SCSI] sun3: Provide a dummy NCR5380_exit() (diff)
downloadkernel-qcow2-linux-0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149.tar.gz
kernel-qcow2-linux-0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149.tar.xz
kernel-qcow2-linux-0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149.zip
[SCSI] sun3: Check for NCR_TIMEOUT being defined instead of having a value
This fixes: drivers/scsi/sun3_NCR5380.c:1448:5: warning: "NCR_TIMEOUT" is not defined Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/sun3_NCR5380.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 2ba1cb781091..f3cffdf5a011 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1445,7 +1445,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
local_irq_restore(flags);
/* Wait for arbitration logic to complete */
-#if NCR_TIMEOUT
+#ifdef NCR_TIMEOUT
{
unsigned long timeout = jiffies + 2*NCR_TIMEOUT;