aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/libata.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-06 04:52:48 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-06 04:52:48 -0500
commit701db69d6647f61e4660c9102d7f2fd5dffc203d (patch)
treee3ebe94f72b4bbdfad608d77d7b11719022b8c9b /drivers/scsi/libata.h
parent6cf5bcaaf9a92225017f7a3f1a630f6b5147ad4a (diff)
parentfe79e683ccdb29c13b3e0d18507474b4e2d9aab6 (diff)
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/libata.h')
-rw-r--r--drivers/scsi/libata.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 8ebaa694d18..686255df76b 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -39,7 +39,7 @@ struct ata_scsi_args {
/* libata-core.c */
extern int atapi_enabled;
-extern int ata_qc_complete_noop(struct ata_queued_cmd *qc, unsigned int err_mask);
+extern int ata_qc_complete_noop(struct ata_queued_cmd *qc);
extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
struct ata_device *dev);
extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc);