diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:09:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:09:16 -0400 |
| commit | 92d15c2ccbb3e31a3fc71ad28fdb55e1319383c0 (patch) | |
| tree | 8d83c0dc3c6b935d8367e331872f242b742f0a8a /drivers/ata/libata-scsi.c | |
| parent | f20bf6125605acbbc7eb8c9420d7221c91aa83eb (diff) | |
| parent | 644bd2f048972d75eb1979b1fdca257d528ce687 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: (63 commits)
Fix memory leak in dm-crypt
SPARC64: sg chaining support
SPARC: sg chaining support
PPC: sg chaining support
PS3: sg chaining support
IA64: sg chaining support
x86-64: enable sg chaining
x86-64: update pci-gart iommu to sg helpers
x86-64: update nommu to sg helpers
x86-64: update calgary iommu to sg helpers
swiotlb: sg chaining support
i386: enable sg chaining
i386 dma_map_sg: convert to using sg helpers
mmc: need to zero sglist on init
Panic in blk_rq_map_sg() from CCISS driver
remove sglist_len
remove blk_queue_max_phys_segments in libata
revert sg segment size ifdefs
Fixup u14-34f ENABLE_SG_CHAINING
qla1280: enable use_sg_chaining option
...
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 5237a491622b..9fbb39cd0f58 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -801,8 +801,6 @@ int ata_scsi_slave_config(struct scsi_device *sdev) | |||
| 801 | 801 | ||
| 802 | ata_scsi_sdev_config(sdev); | 802 | ata_scsi_sdev_config(sdev); |
| 803 | 803 | ||
| 804 | blk_queue_max_phys_segments(sdev->request_queue, LIBATA_MAX_PRD); | ||
| 805 | |||
| 806 | sdev->manage_start_stop = 1; | 804 | sdev->manage_start_stop = 1; |
| 807 | 805 | ||
| 808 | if (dev) | 806 | if (dev) |