From 476a93b6edbf6f4eb72e3efe6524340bed1c3483 Mon Sep 17 00:00:00 2001
From: Sam Creasey <sammy@sammy.net>
Date: Sat, 9 Dec 2006 10:37:05 +0100
Subject: [PATCH] --- yaml --- r: 43899 b: refs/heads/master c:
 c39e7eee149b4105fc49df27a2cb04fad880bb00 h: refs/heads/master i:   43897:
 2eacb57fab48bf50d68e336820170b7476555156   43895:
 f40817b41af1b30fc0e635e05d8f82d06aabe776 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/Kconfig         | 2 +-
 trunk/drivers/scsi/sun3_NCR5380.c  | 4 ++--
 trunk/drivers/scsi/sun3_scsi.c     | 2 +-
 trunk/drivers/scsi/sun3_scsi.h     | 2 +-
 trunk/drivers/scsi/sun3_scsi_vme.c | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e2e04235dcc1..2fca0b4b1170 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3a79bd7c75f0055df16540c7e9dbe270060ebe8
+refs/heads/master: c39e7eee149b4105fc49df27a2cb04fad880bb00
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
index 69569096dae5..60f582727185 100644
--- a/trunk/drivers/scsi/Kconfig
+++ b/trunk/drivers/scsi/Kconfig
@@ -1737,7 +1737,7 @@ config SCSI_NCR53C7xx_FAST
 
 config SUN3_SCSI
 	tristate "Sun3 NCR5380 SCSI"
-	depends on SUN3 && SCSI && BROKEN
+	depends on SUN3 && SCSI
 	select SCSI_SPI_ATTRS
 	help
 	  This option will enable support for the OBIO (onboard io) NCR5380
diff --git a/trunk/drivers/scsi/sun3_NCR5380.c b/trunk/drivers/scsi/sun3_NCR5380.c
index 3b3f3050a877..43f5b6aa7dc4 100644
--- a/trunk/drivers/scsi/sun3_NCR5380.c
+++ b/trunk/drivers/scsi/sun3_NCR5380.c
@@ -1271,7 +1271,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id)
 	NCR_PRINT(NDEBUG_INTR);
 	if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
 	    done = 0;
-	    ENABLE_IRQ();
+//	    ENABLE_IRQ();
 	    INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO);
 	    NCR5380_reselect(instance);
 	    (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG);
@@ -1304,7 +1304,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id)
 		INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);
 		NCR5380_dma_complete( instance );
 		done = 0;
-		ENABLE_IRQ();
+//		ENABLE_IRQ();
 	    } else
 #endif /* REAL_DMA */
 	    {
diff --git a/trunk/drivers/scsi/sun3_scsi.c b/trunk/drivers/scsi/sun3_scsi.c
index d56d85dd9ba0..69ee3e4a820e 100644
--- a/trunk/drivers/scsi/sun3_scsi.c
+++ b/trunk/drivers/scsi/sun3_scsi.c
@@ -75,9 +75,9 @@
 #define REAL_DMA
 
 #include "scsi.h"
+#include "initio.h"
 #include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
-#include "NCR5380.h"
 
 static void NCR5380_print(struct Scsi_Host *instance);
 
diff --git a/trunk/drivers/scsi/sun3_scsi.h b/trunk/drivers/scsi/sun3_scsi.h
index a1103b3e2034..b29a9d661ca4 100644
--- a/trunk/drivers/scsi/sun3_scsi.h
+++ b/trunk/drivers/scsi/sun3_scsi.h
@@ -221,7 +221,7 @@ struct sun3_udc_regs {
  *
  */
 
-
+#include "NCR5380.h"
 
 #if NDEBUG & NDEBUG_ARBITRATION
 #define ARB_PRINTK(format, args...) \
diff --git a/trunk/drivers/scsi/sun3_scsi_vme.c b/trunk/drivers/scsi/sun3_scsi_vme.c
index 92def310a84c..bb0c9fd99e68 100644
--- a/trunk/drivers/scsi/sun3_scsi_vme.c
+++ b/trunk/drivers/scsi/sun3_scsi_vme.c
@@ -41,9 +41,9 @@
 #define REAL_DMA
 
 #include "scsi.h"
+#include "initio.h"
 #include <scsi/scsi_host.h>
 #include "sun3_scsi.h"
-#include "NCR5380.h"
 
 extern int sun3_map_test(unsigned long, char *);