diff options
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r-- | drivers/ata/sata_nv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 1eb4e020eb5c..2a98b09ab735 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
@@ -38,6 +38,7 @@ | |||
38 | 38 | ||
39 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
41 | #include <linux/gfp.h> | ||
41 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
42 | #include <linux/init.h> | 43 | #include <linux/init.h> |
43 | #include <linux/blkdev.h> | 44 | #include <linux/blkdev.h> |
@@ -772,7 +773,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev) | |||
772 | } | 773 | } |
773 | 774 | ||
774 | blk_queue_segment_boundary(sdev->request_queue, segment_boundary); | 775 | blk_queue_segment_boundary(sdev->request_queue, segment_boundary); |
775 | blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize); | 776 | blk_queue_max_segments(sdev->request_queue, sg_tablesize); |
776 | ata_port_printk(ap, KERN_INFO, | 777 | ata_port_printk(ap, KERN_INFO, |
777 | "DMA mask 0x%llX, segment boundary 0x%lX, hw segs %hu\n", | 778 | "DMA mask 0x%llX, segment boundary 0x%lX, hw segs %hu\n", |
778 | (unsigned long long)*ap->host->dev->dma_mask, | 779 | (unsigned long long)*ap->host->dev->dma_mask, |
@@ -1975,7 +1976,7 @@ static int nv_swncq_slave_config(struct scsi_device *sdev) | |||
1975 | ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num)); | 1976 | ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num)); |
1976 | 1977 | ||
1977 | if (strncmp(model_num, "Maxtor", 6) == 0) { | 1978 | if (strncmp(model_num, "Maxtor", 6) == 0) { |
1978 | ata_scsi_change_queue_depth(sdev, 1); | 1979 | ata_scsi_change_queue_depth(sdev, 1, SCSI_QDEPTH_DEFAULT); |
1979 | ata_dev_printk(dev, KERN_NOTICE, | 1980 | ata_dev_printk(dev, KERN_NOTICE, |
1980 | "Disabling SWNCQ mode (depth %x)\n", sdev->queue_depth); | 1981 | "Disabling SWNCQ mode (depth %x)\n", sdev->queue_depth); |
1981 | } | 1982 | } |