diff options
| author | Sam Creasey <sammy@sammy.net> | 2006-12-09 10:37:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-09 09:41:18 -0800 |
| commit | c39e7eee149b4105fc49df27a2cb04fad880bb00 (patch) | |
| tree | 16900d269d2aefe32c2c0280f2291b886c84c599 | |
| parent | a3a79bd7c75f0055df16540c7e9dbe270060ebe8 (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>
| -rw-r--r-- | drivers/scsi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/scsi/sun3_NCR5380.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/sun3_scsi.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/sun3_scsi.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/sun3_scsi_vme.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 69569096dae5..60f582727185 100644 --- a/drivers/scsi/Kconfig +++ b/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/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) 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/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c index d56d85dd9ba0..69ee3e4a820e 100644 --- a/drivers/scsi/sun3_scsi.c +++ b/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/drivers/scsi/sun3_scsi.h b/drivers/scsi/sun3_scsi.h index a1103b3e2034..b29a9d661ca4 100644 --- a/drivers/scsi/sun3_scsi.h +++ b/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/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c index 92def310a84c..bb0c9fd99e68 100644 --- a/drivers/scsi/sun3_scsi_vme.c +++ b/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 *); |