From: Gary Zhang Date: Fri, 26 Oct 2012 08:10:38 +0000 (+0800) Subject: ENGR00231321-1 mx6: remove wm8958 in imx6_defconfig X-Git-Tag: v3.0.35-fsl~319 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a3c626879e2293da3fd8afba56f547ca089ae70;p=karo-tx-linux.git ENGR00231321-1 mx6: remove wm8958 in imx6_defconfig not set wm8958 codec as builtin in imx6_defconfig Signed-off-by: Gary Zhang --- diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index f1bab5fe2838..f62ea0ebab7d 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1848,7 +1848,7 @@ CONFIG_SND_IMX_SOC=y CONFIG_SND_MXC_SOC_MX2=y CONFIG_SND_MXC_SOC_SPDIF_DAI=y CONFIG_SND_SOC_IMX_SGTL5000=y -CONFIG_SND_SOC_IMX_WM8958=y +# CONFIG_SND_SOC_IMX_WM8958 is not set CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_CS42888=y # CONFIG_SND_SOC_IMX_SI4763 is not set @@ -1856,13 +1856,13 @@ CONFIG_SND_SOC_IMX_SPDIF=y CONFIG_SND_SOC_IMX_HDMI=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set -CONFIG_SND_SOC_WM_HUBS=y +# CONFIG_SND_SOC_WM_HUBS is not set CONFIG_SND_SOC_MXC_HDMI=y CONFIG_SND_SOC_MXC_SPDIF=y CONFIG_SND_SOC_SGTL5000=y CONFIG_SND_SOC_CS42888=y CONFIG_SND_SOC_WM8962=y -CONFIG_SND_SOC_WM8994=y +# CONFIG_SND_SOC_WM8994 is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=y CONFIG_HID_SUPPORT=y