Merge mainline (v2.6.34-rc7)

[pandora-kernel.git] / drivers / block / sx8.c

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 7bd7b2f..b70f0fc 100644 (file)
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1518,8 +1518,7 @@ static int carm_init_disks(struct carm_host *host)
                        break;
                }
                disk->queue = q;
-               blk_queue_max_hw_segments(q, CARM_MAX_REQ_SG);
-               blk_queue_max_phys_segments(q, CARM_MAX_REQ_SG);
+               blk_queue_max_segments(q, CARM_MAX_REQ_SG);
                blk_queue_segment_boundary(q, CARM_SG_BOUNDARY);
 
                q->queuedata = port;