Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Sam Creasey and committed by
Linus Torvalds
c39e7eee a3a79bd7

+6 -6
+1 -1
drivers/scsi/Kconfig
··· 1737 1737 1738 1738 config SUN3_SCSI 1739 1739 tristate "Sun3 NCR5380 SCSI" 1740 - depends on SUN3 && SCSI && BROKEN 1740 + depends on SUN3 && SCSI 1741 1741 select SCSI_SPI_ATTRS 1742 1742 help 1743 1743 This option will enable support for the OBIO (onboard io) NCR5380
+2 -2
drivers/scsi/sun3_NCR5380.c
··· 1271 1271 NCR_PRINT(NDEBUG_INTR); 1272 1272 if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { 1273 1273 done = 0; 1274 - ENABLE_IRQ(); 1274 + // ENABLE_IRQ(); 1275 1275 INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO); 1276 1276 NCR5380_reselect(instance); 1277 1277 (void) NCR5380_read(RESET_PARITY_INTERRUPT_REG); ··· 1304 1304 INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO); 1305 1305 NCR5380_dma_complete( instance ); 1306 1306 done = 0; 1307 - ENABLE_IRQ(); 1307 + // ENABLE_IRQ(); 1308 1308 } else 1309 1309 #endif /* REAL_DMA */ 1310 1310 {
+1 -1
drivers/scsi/sun3_scsi.c
··· 75 75 #define REAL_DMA 76 76 77 77 #include "scsi.h" 78 + #include "initio.h" 78 79 #include <scsi/scsi_host.h> 79 80 #include "sun3_scsi.h" 80 - #include "NCR5380.h" 81 81 82 82 static void NCR5380_print(struct Scsi_Host *instance); 83 83
+1 -1
drivers/scsi/sun3_scsi.h
··· 221 221 * 222 222 */ 223 223 224 - 224 + #include "NCR5380.h" 225 225 226 226 #if NDEBUG & NDEBUG_ARBITRATION 227 227 #define ARB_PRINTK(format, args...) \
+1 -1
drivers/scsi/sun3_scsi_vme.c
··· 41 41 #define REAL_DMA 42 42 43 43 #include "scsi.h" 44 + #include "initio.h" 44 45 #include <scsi/scsi_host.h> 45 46 #include "sun3_scsi.h" 46 - #include "NCR5380.h" 47 47 48 48 extern int sun3_map_test(unsigned long, char *); 49 49