(this pulls everything in 'upstream-linus', too)
Please pull from the 'upstream-linus2' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus2
to receive the previously sent changes, and in addition, the following fix:
commit 531e3a61f55261bf466d0415c48999511334933c
Author: Jeff Garzik <jeff@xxxxxxxxxx>
Date: Mon Jul 2 18:12:19 2007 -0400
[libata] sata_nv: undo merge error
Only the ADMA entry was supposed to be able to change queue depth.
Signed-off-by: Jeff Garzik <jeff@xxxxxxxxxx>
drivers/ata/sata_nv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index d53cb8c..b265686 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -307,7 +307,6 @@ static struct scsi_host_template nv_sht = {
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.queuecommand = ata_scsi_queuecmd,
- .change_queue_depth = ata_scsi_change_queue_depth,
.can_queue = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,
.sg_tablesize = LIBATA_MAX_PRD,
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
