diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-04-22 08:51:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-04-22 08:51:44 +0100 |
| commit | 41d91ec3de8a90167159275bde7ed65768723556 (patch) | |
| tree | 6b3609b4317591e3f61edd11e230ad5e3289de09 /include/linux/stackprotector.h | |
| parent | ASoC: wm8960: Fix wrong clock after suspend & resume (diff) | |
| parent | ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init() (diff) | |
Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7
ASoC: tegra: Fixes for v5.7-rc3
This contains a couple of fixes that are needed to properly reconfigure
the audio clocks on older Tegra devices.
Diffstat (limited to 'include/linux/stackprotector.h')
| -rw-r--r-- | include/linux/stackprotector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/stackprotector.h b/include/linux/stackprotector.h index 6b792d080eee..4c678c4fec58 100644 --- a/include/linux/stackprotector.h +++ b/include/linux/stackprotector.h @@ -6,7 +6,7 @@ #include <linux/sched.h> #include <linux/random.h> -#ifdef CONFIG_STACKPROTECTOR +#if defined(CONFIG_STACKPROTECTOR) || defined(CONFIG_ARM64_PTR_AUTH) # include <asm/stackprotector.h> #else static inline void boot_init_stack_canary(void) |