Merge branch 'hid-suspend' into picolcd

[karo-tx-linux.git] / drivers / block / cpqarray.c

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 6422651ec364197ed9418f4a3bafb966208a8417..91d11631cec96a523f8f7f9504ce6405edba920a 100644 (file)
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -448,11 +448,8 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
                blk_queue_bounce_limit(q, hba[i]->pci_dev->dma_mask);
 
        /* This is a hardware imposed limit. */
-       blk_queue_max_hw_segments(q, SG_MAX);
+       blk_queue_max_segments(q, SG_MAX);
 
-       /* This is a driver limit and could be eliminated. */
-       blk_queue_max_phys_segments(q, SG_MAX);
-       
        init_timer(&hba[i]->timer);
        hba[i]->timer.expires = jiffies + IDA_TIMER;
        hba[i]->timer.data = (unsigned long)hba[i];