diff options
| author | Mark Brown <broonie@kernel.org> | 2024-10-29 14:33:54 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-10-29 14:33:54 +0000 |
| commit | 336f0fbf510880f7b2f9ea7e473fefc02222070c (patch) | |
| tree | 0c92b6c9f51d68f1260063a9a2175f314d5de09b /tools/include | |
| parent | caf78b0465053c23aa6211b9815dd5433766627d (diff) | |
| parent | 8e929cb546ee42c9a61d24fae60605e9e3192354 (diff) | |
regmap: Merge up fixes from v6.12-rc3
For the benefit of CI.
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/linux/unaligned.h (renamed from tools/include/asm-generic/unaligned.h) | 6 | ||||
| -rw-r--r-- | tools/include/uapi/linux/in.h | 2 |
2 files changed, 4 insertions, 4 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 */ diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h index d358add1611c..5d32d53508d9 100644 --- a/tools/include/uapi/linux/in.h +++ b/tools/include/uapi/linux/in.h @@ -141,7 +141,7 @@ struct in_addr { */ #define IP_PMTUDISC_INTERFACE 4 /* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get - * fragmented if they exeed the interface mtu + * fragmented if they exceed the interface mtu */ #define IP_PMTUDISC_OMIT 5 |