diff options
author | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
commit | 448cc2fb3a7b327823a9afd374808c37b8e6194f (patch) | |
tree | a6d8ca3fa389980b47a495df2fb10892157c7dbc /drivers/block/rnbd/rnbd-proto.h | |
parent | 527bab0473f28236e4587c7870586275c1ef5516 (diff) | |
parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
download | linux-448cc2fb3a7b327823a9afd374808c37b8e6194f.tar.xz |
Merge drm/drm-next into drm-intel-next
Sync up with drm-next to get v5.16-rc2.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/block/rnbd/rnbd-proto.h')
-rw-r--r-- | drivers/block/rnbd/rnbd-proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rnbd/rnbd-proto.h b/drivers/block/rnbd/rnbd-proto.h index c1bc5c0fef71..de5d5a8df81d 100644 --- a/drivers/block/rnbd/rnbd-proto.h +++ b/drivers/block/rnbd/rnbd-proto.h @@ -10,7 +10,7 @@ #define RNBD_PROTO_H #include <linux/types.h> -#include <linux/blkdev.h> +#include <linux/blk-mq.h> #include <linux/limits.h> #include <linux/inet.h> #include <linux/in.h> |