summaryrefslogtreecommitdiff
path: root/tools/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-10-07 16:01:00 +0300
committerMark Brown <broonie@kernel.org>2024-10-07 16:01:00 +0300
commit85eadae61931f6268b49b5722039e5a248b9ee4c (patch)
tree3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /tools/include
parentdc16594d9967773ca891b3d9111f152e3c99d1cf (diff)
parent8cf0b93919e13d1e8d4466eb4080a4c4d9d66d7b (diff)
downloadlinux-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.xz
regulator: Merge up v6.12-rc2
Pulls in a build fix for the KVM selftests.
Diffstat (limited to 'tools/include')
-rw-r--r--tools/include/linux/unaligned.h (renamed from tools/include/asm-generic/unaligned.h)6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/include/asm-generic/unaligned.h b/tools/include/linux/unaligned.h
index cdd2fd078027..bc0633bc4650 100644
--- a/tools/include/asm-generic/unaligned.h
+++ b/tools/include/linux/unaligned.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __ASM_GENERIC_UNALIGNED_H
-#define __ASM_GENERIC_UNALIGNED_H
+#ifndef __LINUX_UNALIGNED_H
+#define __LINUX_UNALIGNED_H
/*
* This is the most generic implementation of unaligned accesses
@@ -154,4 +154,4 @@ static inline u64 get_unaligned_be48(const void *p)
}
#pragma GCC diagnostic pop
-#endif /* __ASM_GENERIC_UNALIGNED_H */
+#endif /* __LINUX_UNALIGNED_H */