Merge branch 'for-4.11/block' into for-4.11/linus-merge

[karo-tx-linux.git] / block / deadline-iosched.c

diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index 55e0bb6d7da796e3b526a16832914ca88fcb879f..05fc0ea25a98d3f93c1f667c2280e7e99d7a799a 100644 (file)
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -439,7 +439,7 @@ static struct elv_fs_entry deadline_attrs[] = {
 };
 
 static struct elevator_type iosched_deadline = {
-       .ops = {
+       .ops.sq = {
                .elevator_merge_fn =            deadline_merge,
                .elevator_merged_fn =           deadline_merged_request,
                .elevator_merge_req_fn =        deadline_merged_requests,