diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
| commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
| tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/scsi/mvme147.c | |
| parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
| parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/mvme147.c')
| -rw-r--r-- | drivers/scsi/mvme147.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c index 33380cee9b77..cb367c2c5c78 100644 --- a/drivers/scsi/mvme147.c +++ b/drivers/scsi/mvme147.c | |||
| @@ -63,7 +63,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, | |||
| 63 | m147_pcc->dma_cntrl = 0; | 63 | m147_pcc->dma_cntrl = 0; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | int mvme147_detect(Scsi_Host_Template *tpnt) | 66 | int mvme147_detect(struct scsi_host_template *tpnt) |
| 67 | { | 67 | { |
| 68 | static unsigned char called = 0; | 68 | static unsigned char called = 0; |
| 69 | wd33c93_regs regs; | 69 | wd33c93_regs regs; |
| @@ -130,7 +130,7 @@ static int mvme147_bus_reset(Scsi_Cmnd *cmd) | |||
| 130 | 130 | ||
| 131 | #include "mvme147.h" | 131 | #include "mvme147.h" |
| 132 | 132 | ||
| 133 | static Scsi_Host_Template driver_template = { | 133 | static struct scsi_host_template driver_template = { |
| 134 | .proc_name = "MVME147", | 134 | .proc_name = "MVME147", |
| 135 | .name = "MVME147 built-in SCSI", | 135 | .name = "MVME147 built-in SCSI", |
| 136 | .detect = mvme147_detect, | 136 | .detect = mvme147_detect, |