diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-15 19:49:04 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-15 19:49:04 -0500 |
commit | c12489ad40a9db6b17225e0f38151d41c6175fe8 (patch) | |
tree | cf7ea08c0b3bf106975047c66b8bb0b560cc4e3e /drivers/scsi/libata.h | |
parent | ff7feac9638e162263463edaeb342b4f3b1ce90e (diff) | |
parent | 1e185b97b4364063f1135604b87f8d8469944233 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/scsi/libata.h')
-rw-r--r-- | drivers/scsi/libata.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index fad051ca4672..74a84e0ec0a4 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
@@ -54,8 +54,6 @@ extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); | |||
54 | 54 | ||
55 | 55 | ||
56 | /* libata-scsi.c */ | 56 | /* libata-scsi.c */ |
57 | extern void atapi_request_sense(struct ata_port *ap, struct ata_device *dev, | ||
58 | struct scsi_cmnd *cmd); | ||
59 | extern void ata_scsi_scan_host(struct ata_port *ap); | 57 | extern void ata_scsi_scan_host(struct ata_port *ap); |
60 | extern int ata_scsi_error(struct Scsi_Host *host); | 58 | extern int ata_scsi_error(struct Scsi_Host *host); |
61 | extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf, | 59 | extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf, |