diff options
author | 2024-10-07 14:01:00 +0100 | |
---|---|---|
committer | 2024-10-07 14:01:00 +0100 | |
commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /lib/zstd | |
parent | Add of_regulator_get_optional() and Fix MTK Power (diff) | |
parent | Linux 6.12-rc2 (diff) | |
download | wireguard-linux-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.xz wireguard-linux-85eadae61931f6268b49b5722039e5a248b9ee4c.zip |
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'lib/zstd')
-rw-r--r-- | lib/zstd/common/mem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/zstd/common/mem.h b/lib/zstd/common/mem.h index 1d9cc03924ca..c22a2e69bf46 100644 --- a/lib/zstd/common/mem.h +++ b/lib/zstd/common/mem.h @@ -15,7 +15,7 @@ /*-**************************************** * Dependencies ******************************************/ -#include <asm/unaligned.h> /* get_unaligned, put_unaligned* */ +#include <linux/unaligned.h> /* get_unaligned, put_unaligned* */ #include <linux/compiler.h> /* inline */ #include <linux/swab.h> /* swab32, swab64 */ #include <linux/types.h> /* size_t, ptrdiff_t */ |