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/a2091.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/a2091.c')
-rw-r--r-- | drivers/scsi/a2091.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index 30a14ba77a6a..54996eaae979 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c | |||
@@ -172,7 +172,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | int __init a2091_detect(Scsi_Host_Template *tpnt) | 175 | int __init a2091_detect(struct scsi_host_template *tpnt) |
176 | { | 176 | { |
177 | static unsigned char called = 0; | 177 | static unsigned char called = 0; |
178 | struct Scsi_Host *instance; | 178 | struct Scsi_Host *instance; |
@@ -233,7 +233,7 @@ static int a2091_bus_reset(Scsi_Cmnd *cmd) | |||
233 | 233 | ||
234 | #define HOSTS_C | 234 | #define HOSTS_C |
235 | 235 | ||
236 | static Scsi_Host_Template driver_template = { | 236 | static struct scsi_host_template driver_template = { |
237 | .proc_name = "A2901", | 237 | .proc_name = "A2901", |
238 | .name = "Commodore A2091/A590 SCSI", | 238 | .name = "Commodore A2091/A590 SCSI", |
239 | .detect = a2091_detect, | 239 | .detect = a2091_detect, |