Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-06 05:02:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] Sun3 SCSI: Make sun3 scsi drivers compile/work again

Browse Source 
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>
This commit is contained in:
Sam Creasey 2006-12-09 10:37:05 +01:00 committed by Linus Torvalds
parent a3a79bd7c7
commit c39e7eee14
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/Kconfig
View File

@ -1737,7 +1737,7 @@ config SCSI_NCR53C7xx_FAST
config SUN3_SCSI config SUN3_SCSI
tristate "Sun3 NCR5380 SCSI" tristate "Sun3 NCR5380 SCSI"
depends on SUN3 && SCSI && BROKEN depends on SUN3 && SCSI
select SCSI_SPI_ATTRS select SCSI_SPI_ATTRS
help help
This option will enable support for the OBIO (onboard io) NCR5380 This option will enable support for the OBIO (onboard io) NCR5380

4
drivers/scsi/sun3_NCR5380.c
View File

@ -1271,7 +1271,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id)
NCR_PRINT(NDEBUG_INTR); NCR_PRINT(NDEBUG_INTR);
if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
done = 0; done = 0;
ENABLE_IRQ(); // ENABLE_IRQ();
INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO); INT_PRINTK("scsi%d: SEL interrupt\n", HOSTNO);
NCR5380_reselect(instance); NCR5380_reselect(instance);
(void) NCR5380_read(RESET_PARITY_INTERRUPT_REG); (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); INT_PRINTK("scsi%d: PHASE MISM or EOP interrupt\n", HOSTNO);
NCR5380_dma_complete( instance ); NCR5380_dma_complete( instance );
done = 0; done = 0;
ENABLE_IRQ(); // ENABLE_IRQ();
} else } else
#endif /* REAL_DMA */ #endif /* REAL_DMA */
{ {

2
drivers/scsi/sun3_scsi.c
View File

@ -75,9 +75,9 @@
#define REAL_DMA #define REAL_DMA
#include "scsi.h" #include "scsi.h"
#include "initio.h"
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include "sun3_scsi.h" #include "sun3_scsi.h"
#include "NCR5380.h"
static void NCR5380_print(struct Scsi_Host *instance); static void NCR5380_print(struct Scsi_Host *instance);

2
drivers/scsi/sun3_scsi.h
View File

@ -221,7 +221,7 @@ struct sun3_udc_regs {
* *
*/ */
#include "NCR5380.h"
#if NDEBUG & NDEBUG_ARBITRATION #if NDEBUG & NDEBUG_ARBITRATION
#define ARB_PRINTK(format, args...) \ #define ARB_PRINTK(format, args...) \

2
drivers/scsi/sun3_scsi_vme.c
View File

@ -41,9 +41,9 @@
#define REAL_DMA #define REAL_DMA
#include "scsi.h" #include "scsi.h"
#include "initio.h"
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include "sun3_scsi.h" #include "sun3_scsi.h"
#include "NCR5380.h"
extern int sun3_map_test(unsigned long, char *); extern int sun3_map_test(unsigned long, char *);