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/a3000.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/a3000.c')
| -rw-r--r-- | drivers/scsi/a3000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index 306caf56f3d9..f425d424bf08 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c | |||
| @@ -168,7 +168,7 @@ static void dma_stop (struct Scsi_Host *instance, Scsi_Cmnd *SCpnt, | |||
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | int __init a3000_detect(Scsi_Host_Template *tpnt) | 171 | int __init a3000_detect(struct scsi_host_template *tpnt) |
| 172 | { | 172 | { |
| 173 | wd33c93_regs regs; | 173 | wd33c93_regs regs; |
| 174 | 174 | ||
| @@ -221,7 +221,7 @@ static int a3000_bus_reset(Scsi_Cmnd *cmd) | |||
| 221 | 221 | ||
| 222 | #define HOSTS_C | 222 | #define HOSTS_C |
| 223 | 223 | ||
| 224 | static Scsi_Host_Template driver_template = { | 224 | static struct scsi_host_template driver_template = { |
| 225 | .proc_name = "A3000", | 225 | .proc_name = "A3000", |
| 226 | .name = "Amiga 3000 built-in SCSI", | 226 | .name = "Amiga 3000 built-in SCSI", |
| 227 | .detect = a3000_detect, | 227 | .detect = a3000_detect, |