diff options
author | 2005-11-11 14:04:37 -0800 | |
---|---|---|
committer | 2005-11-11 14:04:37 -0800 | |
commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/scsi/mvme16x.c | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | Merge by hand (whitespace conflicts in libata.h) (diff) | |
download | linux-dev-d72d6f1b5647258e83819b51f72fe37e2b7d7965.tar.xz linux-dev-d72d6f1b5647258e83819b51f72fe37e2b7d7965.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/mvme16x.c')
-rw-r--r-- | drivers/scsi/mvme16x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mvme16x.c b/drivers/scsi/mvme16x.c index 29ec699e0e4d..890e9e232dab 100644 --- a/drivers/scsi/mvme16x.c +++ b/drivers/scsi/mvme16x.c @@ -21,7 +21,7 @@ #include<linux/stat.h> -int mvme16x_scsi_detect(Scsi_Host_Template *tpnt) +int mvme16x_scsi_detect(struct scsi_host_template *tpnt) { static unsigned char called = 0; int clock; @@ -61,7 +61,7 @@ static int mvme16x_scsi_release(struct Scsi_Host *shost) return 0; } -static Scsi_Host_Template driver_template = { +static struct scsi_host_template driver_template = { .name = "MVME16x NCR53c710 SCSI", .detect = mvme16x_scsi_detect, .release = mvme16x_scsi_release, |