From 6789f7b63c2d479fdf238d012e5b68fb1d025f6f Mon Sep 17 00:00:00 2001 From: Abel Vesa Date: Mon, 22 Jan 2018 14:00:46 +0200 Subject: [PATCH] arm64: defconfig: Fixed reordering Introduced by commits: 542070530eb0 MLK-15070-4: ARM64: defconfig: build in sound card for audio board of mscale 8f97c51d8318 MLK-17400-03 arm64: defconfig: add max732x enable This is due to manual editing the config instead of using Kconfig to generate it. Signed-off-by: Abel Vesa Reviewed-by: Daniel Baluta --- arch/arm64/configs/defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 8386b17f56fc..0c67f6b072ef 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -307,9 +307,9 @@ CONFIG_GPIO_DWAPB=y CONFIG_GPIO_PL061=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_XGENE=y +CONFIG_GPIO_MAX732X=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_MAX732X=y CONFIG_GPIO_MAX77620=y CONFIG_POWER_RESET_MSM=y CONFIG_POWER_RESET_XGENE=y @@ -399,9 +399,9 @@ CONFIG_SND_SOC=y CONFIG_SND_SOC_FSL_ACM=y CONFIG_SND_SOC_FSL_HIFI4=y CONFIG_SND_IMX_SOC=y -CONFIG_SND_SOC_IMX_AK4497=y CONFIG_SND_SOC_IMX_AK4458=y CONFIG_SND_SOC_IMX_AK5558=y +CONFIG_SND_SOC_IMX_AK4497=y CONFIG_SND_SOC_IMX_WM8960=y CONFIG_SND_SOC_IMX_WM8524=y CONFIG_SND_SOC_IMX_CS42888=y -- 2.17.1