diff options
| author |   Mark Brown <broonie@kernel.org> | 2024-10-07 14:01:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-07 14:01:00 +0100 |
| commit | 85eadae61931f6268b49b5722039e5a248b9ee4c (patch) | |
| tree | 3ee81f25a394ce2a2ec706f0aff07515b78d4b01 /tools/include | |
| parent | Add of_regulator_get_optional() and Fix MTK Power (diff) | |
| parent | Linux 6.12-rc2 (diff) | |
| download | wireguard-linux-85eadae61931f6268b49b5722039e5a248b9ee4c.tar.xz wireguard-linux-85eadae61931f6268b49b5722039e5a248b9ee4c.zip | |
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 */ |