diff options
author | 2022-02-28 23:12:55 -0800 | |
---|---|---|
committer | 2022-02-28 23:12:55 -0800 | |
commit | 1136fa0c07de570dc17858745af8be169d1440ba (patch) | |
tree | 3221b003517dd3cb13df5ba4b85637cd9ed82692 /include/linux/blktrace_api.h | |
parent | Input: samsung-keypad - properly state IOMEM dependency (diff) | |
parent | Linux 5.17-rc4 (diff) | |
download | wireguard-linux-1136fa0c07de570dc17858745af8be169d1440ba.tar.xz wireguard-linux-1136fa0c07de570dc17858745af8be169d1440ba.zip |
Merge tag 'v5.17-rc4' into for-linus
Merge with mainline to get the Intel ASoC generic helpers header and
other changes.
Diffstat (limited to 'include/linux/blktrace_api.h')
-rw-r--r-- | include/linux/blktrace_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index a083e15df608..22501a293fa5 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -2,7 +2,7 @@ #ifndef BLKTRACE_H #define BLKTRACE_H -#include <linux/blkdev.h> +#include <linux/blk-mq.h> #include <linux/relay.h> #include <linux/compat.h> #include <uapi/linux/blktrace_api.h> |