Commit 30950d15 authored by James Bottomley's avatar James Bottomley Committed by Doug Ledford

fix 53c700.c for new module loader

and add C99 initialisers to NCR_D700.c
parent 21fd26ab
...@@ -124,8 +124,6 @@ ...@@ -124,8 +124,6 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/init.h>
#include <linux/mca.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -236,7 +234,7 @@ static __u8 NCR_700_SDTR_msg[] = { ...@@ -236,7 +234,7 @@ static __u8 NCR_700_SDTR_msg[] = {
NCR_700_MAX_OFFSET NCR_700_MAX_OFFSET
}; };
struct Scsi_Host * __init struct Scsi_Host *
NCR_700_detect(Scsi_Host_Template *tpnt, NCR_700_detect(Scsi_Host_Template *tpnt,
struct NCR_700_Host_Parameters *hostdata) struct NCR_700_Host_Parameters *hostdata)
{ {
...@@ -2020,3 +2018,5 @@ NCR_700_slave_destroy(Scsi_Device *SDp) ...@@ -2020,3 +2018,5 @@ NCR_700_slave_destroy(Scsi_Device *SDp)
EXPORT_SYMBOL(NCR_700_detect); EXPORT_SYMBOL(NCR_700_detect);
EXPORT_SYMBOL(NCR_700_release); EXPORT_SYMBOL(NCR_700_release);
EXPORT_SYMBOL(NCR_700_intr); EXPORT_SYMBOL(NCR_700_intr);
no_module_init;
...@@ -22,11 +22,11 @@ static int D700_release(struct Scsi_Host *host); ...@@ -22,11 +22,11 @@ static int D700_release(struct Scsi_Host *host);
* remaining parameters shown below must be filled in. The 53c700 * remaining parameters shown below must be filled in. The 53c700
* routine NCR_700_detect will fill in all of the missing routines */ * routine NCR_700_detect will fill in all of the missing routines */
#define NCR_D700_SCSI { \ #define NCR_D700_SCSI { \
name: "NCR Dual 700 MCA", \ .name = "NCR Dual 700 MCA", \
proc_name: "NCR_D700", \ .proc_name = "NCR_D700", \
detect: D700_detect, \ .detect = D700_detect, \
release: D700_release, \ .release = D700_release, \
this_id: 7, \ .this_id = 7, \
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment