From a859f20de08ee9660f2e38d8f61ac39f3ce9b1c7 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 13 Jun 2011 20:39:20 +0200
Subject: [PATCH] --- yaml --- r: 257799 b: refs/heads/master c:
 0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149 h: refs/heads/master i:   257797:
 e7ff98b03bc992eec34feb802ce4dace7380089b   257795:
 ce1f1850b4e9559f2dad6d2300df1032601261ff   257791:
 b37c3852065c53ca231a55384004481c90f90b4f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/scsi/sun3_NCR5380.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4ecbcdc7d95..052db8dba206 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19b6c51cf05656c9dd970164be52b120162391bf
+refs/heads/master: 0cb8cd76aa6fc759de3b59f4dd5ab5ed6c3a1149
diff --git a/trunk/drivers/scsi/sun3_NCR5380.c b/trunk/drivers/scsi/sun3_NCR5380.c
index 2ba1cb781091..f3cffdf5a011 100644
--- a/trunk/drivers/scsi/sun3_NCR5380.c
+++ b/trunk/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;