summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_linux.h
diff options
context:
space:
mode:
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>2024-10-14 09:03:34 +0200
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>2024-10-14 09:03:34 +0200
commitbebb45743d52fea1ac0a4a9f465f11d11e885f40 (patch)
treea1dda3e26ac754e78cbb9734dae3f13f3a8adf39 /fs/xfs/xfs_linux.h
parentea7f2dfd13e096dce3198e5ffdb00d21bf7c8fe5 (diff)
parent8e929cb546ee42c9a61d24fae60605e9e3192354 (diff)
Merge tag 'v6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.12-rc3
Diffstat (limited to 'fs/xfs/xfs_linux.h')
-rw-r--r--fs/xfs/xfs_linux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
index 54a098fe7285..9a2221b4aa21 100644
--- a/fs/xfs/xfs_linux.h
+++ b/fs/xfs/xfs_linux.h
@@ -69,7 +69,7 @@ typedef __u32 xfs_nlink_t;
#include <asm/param.h>
#include <linux/uaccess.h>
#include <asm/byteorder.h>
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
#include "xfs_fs.h"
#include "xfs_stats.h"