aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
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
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')
-rw-r--r--drivers/scsi/Kconfig2
-rw-r--r--drivers/scsi/sun3_NCR5380.c4
-rw-r--r--drivers/scsi/sun3_scsi.c2
-rw-r--r--drivers/scsi/sun3_scsi.h2
-rw-r--r--drivers/scsi/sun3_scsi_vme.c2
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
1737 1737
1738config SUN3_SCSI 1738config SUN3_SCSI
1739 tristate "Sun3 NCR5380 SCSI" 1739 tristate "Sun3 NCR5380 SCSI"
1740 depends on SUN3 && SCSI && BROKEN 1740 depends on SUN3 && SCSI
1741 select SCSI_SPI_ATTRS 1741 select SCSI_SPI_ATTRS
1742 help 1742 help
1743 This option will enable support for the OBIO (onboard io) NCR5380 1743 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)
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 {
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 @@
75#define REAL_DMA 75#define REAL_DMA
76 76
77#include "scsi.h" 77#include "scsi.h"
78#include "initio.h"
78#include <scsi/scsi_host.h> 79#include <scsi/scsi_host.h>
79#include "sun3_scsi.h" 80#include "sun3_scsi.h"
80#include "NCR5380.h"
81 81
82static void NCR5380_print(struct Scsi_Host *instance); 82static void NCR5380_print(struct Scsi_Host *instance);
83 83
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 {
221 * 221 *
222 */ 222 */
223 223
224 224#include "NCR5380.h"
225 225
226#if NDEBUG & NDEBUG_ARBITRATION 226#if NDEBUG & NDEBUG_ARBITRATION
227#define ARB_PRINTK(format, args...) \ 227#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 @@
41#define REAL_DMA 41#define REAL_DMA
42 42
43#include "scsi.h" 43#include "scsi.h"
44#include "initio.h"
44#include <scsi/scsi_host.h> 45#include <scsi/scsi_host.h>
45#include "sun3_scsi.h" 46#include "sun3_scsi.h"
46#include "NCR5380.h"
47 47
48extern int sun3_map_test(unsigned long, char *); 48extern int sun3_map_test(unsigned long, char *);
49 49