projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19b6c51
)
[SCSI] sun3: Check for NCR_TIMEOUT being defined instead of having a value
author
Geert Uytterhoeven
<geert@linux-m68k.org>
Mon, 13 Jun 2011 18:39:20 +0000
(20:39 +0200)
committer
James Bottomley
<JBottomley@Parallels.com>
Wed, 29 Jun 2011 20:14:38 +0000
(15:14 -0500)
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>
drivers/scsi/sun3_NCR5380.c
patch
|
blob
|
history
diff --git
a/drivers/scsi/sun3_NCR5380.c
b/drivers/scsi/sun3_NCR5380.c
index
2ba1cb7
..
f3cffdf
100644
(file)
--- 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
+#if
def
NCR_TIMEOUT
{
unsigned long timeout = jiffies + 2*NCR_TIMEOUT;