diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-01-20 21:37:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-01-20 21:37:39 -0800 |
| commit | 25768de50b1f2dbb6ea44bd5148a87fe2c9c3688 (patch) | |
| tree | 91f4e0c1ea9acb1e8d477a5f4dfedd00de67ae13 /lib/zstd/common | |
| parent | Input: xpad - add support for Nacon Evol-X Xbox One Controller (diff) | |
| parent | Input: synaptics - fix crash when enabling pass-through port (diff) | |
| download | wireguard-linux-25768de50b1f2dbb6ea44bd5148a87fe2c9c3688.tar.xz wireguard-linux-25768de50b1f2dbb6ea44bd5148a87fe2c9c3688.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 6.14 merge window.
Diffstat (limited to 'lib/zstd/common')
| -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 */ |