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/fd_mcs.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/fd_mcs.c')
| -rw-r--r-- | drivers/scsi/fd_mcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c index 6d44602aae78..cca485a2b438 100644 --- a/drivers/scsi/fd_mcs.c +++ b/drivers/scsi/fd_mcs.c | |||
| @@ -343,7 +343,7 @@ static void fd_mcs_make_bus_idle(struct Scsi_Host *shpnt) | |||
| 343 | outb(0x01 | PARITY_MASK, TMC_Cntl_port); | 343 | outb(0x01 | PARITY_MASK, TMC_Cntl_port); |
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | static int fd_mcs_detect(Scsi_Host_Template * tpnt) | 346 | static int fd_mcs_detect(struct scsi_host_template * tpnt) |
| 347 | { | 347 | { |
| 348 | int loop; | 348 | int loop; |
| 349 | struct Scsi_Host *shpnt; | 349 | struct Scsi_Host *shpnt; |
| @@ -1343,7 +1343,7 @@ static int fd_mcs_biosparam(struct scsi_device * disk, struct block_device *bdev | |||
| 1343 | return 0; | 1343 | return 0; |
| 1344 | } | 1344 | } |
| 1345 | 1345 | ||
| 1346 | static Scsi_Host_Template driver_template = { | 1346 | static struct scsi_host_template driver_template = { |
| 1347 | .proc_name = "fd_mcs", | 1347 | .proc_name = "fd_mcs", |
| 1348 | .proc_info = fd_mcs_proc_info, | 1348 | .proc_info = fd_mcs_proc_info, |
| 1349 | .detect = fd_mcs_detect, | 1349 | .detect = fd_mcs_detect, |