diff options
| author |   Mark Brown <broonie@kernel.org> | 2023-07-17 06:12:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-17 06:12:31 +0100 |
| commit | 0791faebfe750292a8a842b64795a390ca4a3b51 (patch) | |
| tree | 0e6095a5a0130398b0693bddfdc421c41eebda7c /lib/zstd/common/zstd_deps.h | |
| parent | MAINTAINERS: Redo addition of ssm3515 to APPLE SOUND (diff) | |
| parent | Linux 6.5-rc2 (diff) | |
| download | wireguard-linux-0791faebfe750292a8a842b64795a390ca4a3b51.tar.xz wireguard-linux-0791faebfe750292a8a842b64795a390ca4a3b51.zip | |
ASoC: Merge v6.5-rc2
Get a similar baseline to my other branches, and fixes for people using
the branch.
Diffstat (limited to '')
| -rw-r--r-- | lib/zstd/common/zstd_deps.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h index f06df065dec0..2c34e8a33a1c 100644 --- a/lib/zstd/common/zstd_deps.h +++ b/lib/zstd/common/zstd_deps.h @@ -105,21 +105,3 @@ static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) { #endif /* ZSTD_DEPS_IO */ #endif /* ZSTD_DEPS_NEED_IO */ - -/* - * Only requested when MSAN is enabled. - * Need: - * intptr_t - */ -#ifdef ZSTD_DEPS_NEED_STDINT -#ifndef ZSTD_DEPS_STDINT -#define ZSTD_DEPS_STDINT - -/* - * The Linux Kernel doesn't provide intptr_t, only uintptr_t, which - * is an unsigned long. - */ -typedef long intptr_t; - -#endif /* ZSTD_DEPS_STDINT */ -#endif /* ZSTD_DEPS_NEED_STDINT */ |