diff --git a/[refs] b/[refs] index 3fa9a1819ae5..02a3bafa9f3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b217a903ab6581cba04f88c44284dcdd2a752561 +refs/heads/master: 01e97f6b897bf06ec83375d691f2f4d57f5b3a09 diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 98b45633a27e..8bf1a10e4d88 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -463,7 +463,8 @@ struct request_queue #define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_CLUSTER) | \ - (1 << QUEUE_FLAG_STACKABLE)) + (1 << QUEUE_FLAG_STACKABLE) | \ + (1 << QUEUE_FLAG_SAME_COMP)) static inline int queue_is_locked(struct request_queue *q) {