From: Jeff Garzik Date: Mon, 2 Jul 2007 22:12:19 +0000 (-0400) Subject: [libata] sata_nv: undo merge error X-Git-Tag: v2.6.22~46^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=531e3a61f55261bf466d0415c48999511334933c;p=linux-2.6-omap-h63xx.git [libata] sata_nv: undo merge error Only the ADMA entry was supposed to be able to change queue depth. Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index d53cb8c47f3..b2656867c64 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,