aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mvme147.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 23:39:35 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 23:39:35 -0500
commitf4256e301d9800b1e0276404cb01b3ac85b51067 (patch)
tree975f56627b78f757608b31684311a24ca1478481 /drivers/scsi/mvme147.c
parentfb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff)
parentcd52d1ee9a92587b242d946a2300a3245d3b885a (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/mvme147.c')
-rw-r--r--drivers/scsi/mvme147.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index 2fb31ee6d9f5..cb367c2c5c78 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -2,7 +2,6 @@
2#include <linux/mm.h> 2#include <linux/mm.h>
3#include <linux/blkdev.h> 3#include <linux/blkdev.h>
4#include <linux/sched.h> 4#include <linux/sched.h>
5#include <linux/version.h>
6#include <linux/interrupt.h> 5#include <linux/interrupt.h>
7 6
8#include <asm/page.h> 7#include <asm/page.h>
@@ -64,7 +63,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt,
64 m147_pcc->dma_cntrl = 0; 63 m147_pcc->dma_cntrl = 0;
65} 64}
66 65
67int mvme147_detect(Scsi_Host_Template *tpnt) 66int mvme147_detect(struct scsi_host_template *tpnt)
68{ 67{
69 static unsigned char called = 0; 68 static unsigned char called = 0;
70 wd33c93_regs regs; 69 wd33c93_regs regs;
@@ -131,7 +130,7 @@ static int mvme147_bus_reset(Scsi_Cmnd *cmd)
131 130
132#include "mvme147.h" 131#include "mvme147.h"
133 132
134static Scsi_Host_Template driver_template = { 133static struct scsi_host_template driver_template = {
135 .proc_name = "MVME147", 134 .proc_name = "MVME147",
136 .name = "MVME147 built-in SCSI", 135 .name = "MVME147 built-in SCSI",
137 .detect = mvme147_detect, 136 .detect = mvme147_detect,