Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/ke…

…rnel/git/jgarzik/libata-dev * 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_nv: undo merge error
git-mirror · Jul 3, 2007 · c1fa238 · c1fa238
2 parents b59449b + 531e3a6
commit c1fa238
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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,