diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 00:04:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 00:04:36 -0400 |
| commit | c1fa238762ad2518ab6003983c16508470be6d81 (patch) | |
| tree | 027624143bc17ec70cc30bb745556657f382acb3 /drivers | |
| parent | b59449bea276793b8f228ea07bcb861670d79d75 (diff) | |
| parent | 531e3a61f55261bf466d0415c48999511334933c (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/sata_nv.c | 1 |
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 = { | |||
| 307 | .name = DRV_NAME, | 307 | .name = DRV_NAME, |
| 308 | .ioctl = ata_scsi_ioctl, | 308 | .ioctl = ata_scsi_ioctl, |
| 309 | .queuecommand = ata_scsi_queuecmd, | 309 | .queuecommand = ata_scsi_queuecmd, |
| 310 | .change_queue_depth = ata_scsi_change_queue_depth, | ||
| 311 | .can_queue = ATA_DEF_QUEUE, | 310 | .can_queue = ATA_DEF_QUEUE, |
| 312 | .this_id = ATA_SHT_THIS_ID, | 311 | .this_id = ATA_SHT_THIS_ID, |
| 313 | .sg_tablesize = LIBATA_MAX_PRD, | 312 | .sg_tablesize = LIBATA_MAX_PRD, |