diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-10-17 12:52:05 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-10-17 12:52:05 -0400 |
| commit | c141cf76918e25ec7bd433b47590e8c3f3d02542 (patch) | |
| tree | 1e3fcb7389980d9471114737f4a01588f56153cb /lib/vsprintf.c | |
| parent | af4f896f77b30bf6811696dc86fcf61c9daf1c85 (diff) | |
| parent | 26bb2dc102783fef49336b26a94563318f9790d3 (diff) | |
Merge drm/drm-next into drm-intel-next
Needed to bring some KVM changes to be able to include a fix in our Kconfig.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 09f022ba1c05..c5e2ec9303c5 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -51,7 +51,7 @@ #include <asm/page.h> /* for PAGE_SIZE */ #include <asm/byteorder.h> /* cpu_to_le16 */ -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include <linux/string_helpers.h> #include "kstrtox.h" |