Merge branch 'hid-suspend' into picolcd

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

diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index d5cdce08ffd2765aa1f5b3cc83b399093bbf09e7..034e6dfc878c04778ee0a2862bf0afee2c52ba62 100644 (file)
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -34,7 +34,6 @@
 #include <linux/fs.h>
 #include <linux/kernel.h>
 #include <linux/genhd.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
@@ -719,7 +718,7 @@ static int __init hd_init(void)
                return -ENOMEM;
        }
 
-       blk_queue_max_sectors(hd_queue, 255);
+       blk_queue_max_hw_sectors(hd_queue, 255);
        init_timer(&device_timer);
        device_timer.function = hd_times_out;
        blk_queue_logical_block_size(hd_queue, 512);