diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-01-05 15:38:34 +0100 |
| commit | f81483aaeb59da530b286fe5d081e1705eb5c886 (patch) | |
| tree | a4fed750afcdf61df3a2e3c7ab4456c515651290 /include/soc/tegra/pm.h | |
| parent | ALSA: hda/realtek: Use ALC285_FIXUP_HP_GPIO_LED on another HP laptop (diff) | |
| parent | ALSA: hda/cs8409: Fix Jack detection after resume (diff) | |
| download | linux-f81483aaeb59da530b286fe5d081e1705eb5c886.tar.xz linux-f81483aaeb59da530b286fe5d081e1705eb5c886.zip | |
Merge branch 'for-next' into for-linus
Pull 5.17 materials.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/soc/tegra/pm.h')
| -rw-r--r-- | include/soc/tegra/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/soc/tegra/pm.h b/include/soc/tegra/pm.h index 433878927026..ce4d0b1bd0d6 100644 --- a/include/soc/tegra/pm.h +++ b/include/soc/tegra/pm.h @@ -17,7 +17,7 @@ enum tegra_suspend_mode { TEGRA_SUSPEND_NOT_READY, }; -#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_ARM) +#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_ARM) && defined(CONFIG_ARCH_TEGRA) enum tegra_suspend_mode tegra_pm_validate_suspend_mode(enum tegra_suspend_mode mode); |