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/atari_scsi.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/atari_scsi.c')
| -rw-r--r-- | drivers/scsi/atari_scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index af8adb629b33..f4c1ca7c1572 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c | |||
| @@ -600,7 +600,7 @@ int atari_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)) | |||
| 600 | #endif | 600 | #endif |
| 601 | 601 | ||
| 602 | 602 | ||
| 603 | int atari_scsi_detect (Scsi_Host_Template *host) | 603 | int atari_scsi_detect (struct scsi_host_template *host) |
| 604 | { | 604 | { |
| 605 | static int called = 0; | 605 | static int called = 0; |
| 606 | struct Scsi_Host *instance; | 606 | struct Scsi_Host *instance; |
| @@ -1141,7 +1141,7 @@ static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value | |||
| 1141 | 1141 | ||
| 1142 | #include "atari_NCR5380.c" | 1142 | #include "atari_NCR5380.c" |
| 1143 | 1143 | ||
| 1144 | static Scsi_Host_Template driver_template = { | 1144 | static struct scsi_host_template driver_template = { |
| 1145 | .proc_info = atari_scsi_proc_info, | 1145 | .proc_info = atari_scsi_proc_info, |
| 1146 | .name = "Atari native SCSI", | 1146 | .name = "Atari native SCSI", |
| 1147 | .detect = atari_scsi_detect, | 1147 | .detect = atari_scsi_detect, |