summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-02 21:04:36 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-02 21:04:36 -0700
commitc1fa238762ad2518ab6003983c16508470be6d81 (patch)
tree027624143bc17ec70cc30bb745556657f382acb3
parentb59449bea276793b8f228ea07bcb861670d79d75 (diff)
parent531e3a61f55261bf466d0415c48999511334933c (diff)
downloadlinux-c1fa238762ad2518ab6003983c16508470be6d81.tar.gz
linux-c1fa238762ad2518ab6003983c16508470be6d81.tar.bz2
linux-c1fa238762ad2518ab6003983c16508470be6d81.zip
Merge branch 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus2' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] sata_nv: undo merge error
-rw-r--r--drivers/ata/sata_nv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index d53cb8c47f39..b2656867c647 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,