diff --git a/[refs] b/[refs]
index 7c6c4c32ddcb..8a90ce3f8fea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 961515f613f26b7958c56c5c71061a8231e02be7
+refs/heads/master: c7ebf0657b1f47d85aee8349ed6345d940d7232a
diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c
index e0695bca7027..66d4aa8799b7 100644
--- a/trunk/block/blk-settings.c
+++ b/trunk/block/blk-settings.c
@@ -242,7 +242,7 @@ EXPORT_SYMBOL(blk_queue_max_hw_sectors);
 /**
  * blk_queue_max_discard_sectors - set max sectors for a single discard
  * @q:  the request queue for the device
- * @max_discard: maximum number of sectors to discard
+ * @max_discard_sectors: maximum number of sectors to discard
  **/
 void blk_queue_max_discard_sectors(struct request_queue *q,
 		unsigned int max_discard_sectors)