aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sun3_NCR5380.c
diff options
context:
space:
mode:
authorSam Creasey <sammy@sammy.net>2006-12-09 04:37:05 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-09 12:41:18 -0500
commitc39e7eee149b4105fc49df27a2cb04fad880bb00 (patch)
tree16900d269d2aefe32c2c0280f2291b886c84c599 /drivers/scsi/sun3_NCR5380.c
parenta3a79bd7c75f0055df16540c7e9dbe270060ebe8 (diff)
[PATCH] Sun3 SCSI: Make sun3 scsi drivers compile/work again
Make sun3 scsi drivers compile/work again (though with way too many warnings...) Tested on 3/50, 3/60. Signed-off-by: Sam Creasey <sammy@sammy.net> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/sun3_NCR5380.c')
-rw-r--r--drivers/scsi/sun3_NCR5380.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 3b3f3050a877..43f5b6aa7dc4 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1271,7 +1271,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id)
1271 NCR_PRINT(NDEBUG_INTR); 1271 NCR_PRINT(NDEBUG_INTR);
1272 if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { 1272 if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
1273 done = 0; 1273 done = 0;
1274 ENABLE_IRQ(); 1274// ENABLE_IRQ();
1275 INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO); 1275 INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO);
1276 NCR5380_reselect(instance); 1276 NCR5380_reselect(instance);
1277 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG); 1277 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
@@ -1304,7 +1304,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id)
1304 INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO); 1304 INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);
1305 NCR5380_dma_complete( instance ); 1305 NCR5380_dma_complete( instance );
1306 done = 0; 1306 done = 0;
1307 ENABLE_IRQ(); 1307// ENABLE_IRQ();
1308 } else 1308 } else
1309#endif /* REAL_DMA */ 1309#endif /* REAL_DMA */
1310 { 1310 {