diff options
author | Mark Brown <broonie@kernel.org> | 2024-10-07 14:54:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2024-10-07 14:54:21 +0100 |
commit | 344190e0347324d95393c561a4b8c8dfa8cd628b (patch) | |
tree | 20d054b028d30ed361fbaeb20f319482e4a8312f /fs/ecryptfs/inode.c | |
parent | e4926ca0189dac2e780d6d3cca92052376fd7f0e (diff) | |
parent | 8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff) |
ASoC: Merge up v6.12
Fixes build issues with the KVM selftests
Diffstat (limited to 'fs/ecryptfs/inode.c')
-rw-r--r-- | fs/ecryptfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index 5ed1e4cf6c0b..cbdf82f0183f 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c @@ -21,7 +21,7 @@ #include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> #include <linux/fileattr.h> -#include <asm/unaligned.h> +#include <linux/unaligned.h> #include "ecryptfs_kernel.h" static int lock_parent(struct dentry *dentry, |