diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
| commit | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (patch) | |
| tree | 2e0051ccb147b0553d50c14681c50881098859d6 /drivers/scsi/aha1542.h | |
| parent | e89dc9209692293434da45ec31826a55becb91c0 (diff) | |
| parent | 9e6c67fd2716720d9029d38ea25884efcfdedeb6 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/aha1542.h')
| -rw-r--r-- | drivers/scsi/aha1542.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aha1542.h b/drivers/scsi/aha1542.h index 3821ee17f471..1db538552d56 100644 --- a/drivers/scsi/aha1542.h +++ b/drivers/scsi/aha1542.h | |||
| @@ -131,7 +131,7 @@ struct ccb { /* Command Control Block 5.3 */ | |||
| 131 | /* REQUEST SENSE */ | 131 | /* REQUEST SENSE */ |
| 132 | }; | 132 | }; |
| 133 | 133 | ||
| 134 | static int aha1542_detect(Scsi_Host_Template *); | 134 | static int aha1542_detect(struct scsi_host_template *); |
| 135 | static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); | 135 | static int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); |
| 136 | static int aha1542_bus_reset(Scsi_Cmnd * SCpnt); | 136 | static int aha1542_bus_reset(Scsi_Cmnd * SCpnt); |
| 137 | static int aha1542_dev_reset(Scsi_Cmnd * SCpnt); | 137 | static int aha1542_dev_reset(Scsi_Cmnd * SCpnt); |