summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-08-12 15:55:53 +0400
committerShawn Guo <shawn.guo@linaro.org>2013-08-22 19:20:53 +0400
commit7e463b7c1bd85e33dc2322b131f68d78a242c1e3 (patch)
treefe1857c6011b8079a826783ae1639170f8687f32 /arch/arm/configs/imx_v6_v7_defconfig
parentddcb9aa65a759112ea3548c2adc473f0086a031e (diff)
downloadlinux-7e463b7c1bd85e33dc2322b131f68d78a242c1e3.tar.xz
ARM: imx: Re-select CONFIG_SND_SOC_IMX_MC13783 option
Commit 02502da45 (ASoC: imx-mc13783: Depend on ARCH_ARM) caused the selection of CONFIG_SND_SOC_IMX_MC13783 to be impossible due to a wrong dependency, which caused CONFIG_SND_SOC_IMX_MC13783 to be removed after the defconfigs cleanups. The original selection problem has been fixed by 9f19de649f (ASoC: imx-mc13783: Make SND_SOC_IMX_MC13783 visible again), so it is possible to select CONFIG_SND_SOC_IMX_MC13783 again as originally done. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 577f054dbd8e..5d488c24b132 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -188,6 +188,7 @@ CONFIG_SND_SOC_PHYCORE_AC97=y
CONFIG_SND_SOC_EUKREA_TLV320=y
CONFIG_SND_SOC_IMX_WM8962=y
CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y