Skip to content

Commit 95fff58

Browse files
committed
ARM: config: multi v7: Add renamed symbols
These options were renamed in recent times. Add the new name so the driver is built again, and drop the old name. POWER_AVS was renamed POWER_AVS_OMAP in commit bca815d ("PM: AVS: smartreflex Move driver to soc specific drivers"). Add the new symbol. QCOM_PM became ARM_QCOM_SPM_CPUIDLE in commit a871be6 ("cpuidle: Convert Qualcomm SPM driver to a generic CPUidle driver"). SND_MMP_SOC became CONFIG_SND_MMP_SOC_SSPA in commit a97e384 ("ASoC: mmp-sspa: Add Device Tree support"). Enable that instead. Signed-off-by: Joel Stanley <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent e07ecee commit 95fff58

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ CONFIG_ARM_CPUIDLE=y
117117
CONFIG_ARM_ZYNQ_CPUIDLE=y
118118
CONFIG_ARM_EXYNOS_CPUIDLE=y
119119
CONFIG_ARM_TEGRA_CPUIDLE=y
120+
CONFIG_ARM_QCOM_SPM_CPUIDLE=y
120121
CONFIG_KERNEL_MODE_NEON=y
121122
CONFIG_ARM_SCMI_PROTOCOL=y
122123
CONFIG_RASPBERRYPI_FIRMWARE=y
@@ -469,7 +470,6 @@ CONFIG_GPIO_TPS6586X=y
469470
CONFIG_GPIO_TPS65910=y
470471
CONFIG_GPIO_TWL4030=y
471472
CONFIG_GPIO_MXC=y
472-
CONFIG_POWER_AVS=y
473473
CONFIG_ROCKCHIP_IODOMAIN=y
474474
CONFIG_POWER_RESET_AS3722=y
475475
CONFIG_POWER_RESET_GPIO=y
@@ -731,8 +731,8 @@ CONFIG_SND_ATMEL_SOC_PDMIC=m
731731
CONFIG_SND_ATMEL_SOC_I2S=m
732732
CONFIG_SND_BCM2835_SOC_I2S=m
733733
CONFIG_SND_SOC_FSL_SAI=m
734-
CONFIG_SND_MMP_SOC=y
735734
CONFIG_SND_PXA_SOC_SSP=m
735+
CONFIG_SND_MMP_SOC_SSPA=m
736736
CONFIG_SND_PXA910_SOC=m
737737
CONFIG_SND_SOC_ROCKCHIP=m
738738
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@@ -992,7 +992,6 @@ CONFIG_ASPEED_LPC_SNOOP=m
992992
CONFIG_ASPEED_P2A_CTRL=m
993993
CONFIG_RASPBERRYPI_POWER=y
994994
CONFIG_QCOM_GSBI=y
995-
CONFIG_QCOM_PM=y
996995
CONFIG_QCOM_SMD_RPM=m
997996
CONFIG_QCOM_WCNSS_CTRL=m
998997
CONFIG_ARCH_EMEV2=y

0 commit comments

Comments
 (0)