diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-10-14 09:17:57 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-10-14 09:17:57 +0200 |
| commit | 5338a96c974654e226665b2f412fad2f82d4b701 (patch) | |
| tree | dad34c52f8ff45a3237b0cdc4521ad7978fe4d5e /crypto/xxhash_generic.c | |
| parent | b8128f7815ff135f0333c1b46dcdf1543c41b860 (diff) | |
| parent | 26bb2dc102783fef49336b26a94563318f9790d3 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging to get fixes from v6.12-rc2.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'crypto/xxhash_generic.c')
| -rw-r--r-- | crypto/xxhash_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/xxhash_generic.c b/crypto/xxhash_generic.c index 55d1c8a76127..ac206ad4184d 100644 --- a/crypto/xxhash_generic.c +++ b/crypto/xxhash_generic.c @@ -4,7 +4,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/xxhash.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #define XXHASH64_BLOCK_SIZE 32 #define XXHASH64_DIGEST_SIZE 8 |