Merge branch 'master'

[pandora-kernel.git] / drivers / scsi / libata.h

diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 74a84e0..251e53b 100644 (file)
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -29,7 +29,7 @@
 #define __LIBATA_H__
 
 #define DRV_NAME       "libata"
-#define DRV_VERSION    "1.12"  /* must be exactly four chars */
+#define DRV_VERSION    "1.20"  /* must be exactly four chars */
 
 struct ata_scsi_args {
        u16                     *id;
@@ -39,7 +39,6 @@ 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 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);