aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-09-06 09:51:31 -0300
committerJohn Rigby <john.rigby@linaro.org>2011-11-18 20:10:50 -0700
commit7752638513744af2027ebbeec9f2e51d2f2b9098 (patch)
tree6e38e07ef6cfac1def3294d361fd121231ffda89
parent58cb64cd7024909003a7b55c85648d597667f3d7 (diff)
Revert "LINARO: CONFIG: Temporarily turn off audio support for SDP4430 and Panda"
This reverts commit 0840074154a0856e79e15e67b7453359c43a2b08.
-rw-r--r--debian.linaro/config/config.common.ubuntu13
1 files changed, 10 insertions, 3 deletions
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 1e0425b1c9b..6ad2509429f 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -1748,17 +1748,22 @@ CONFIG_SND_MIXER_OSS=m
# CONFIG_SND_MPU401 is not set
# CONFIG_SND_MTPAV is not set
CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_ABE=y
+CONFIG_SND_OMAP_SOC_ABE_DSP=y
CONFIG_SND_OMAP_SOC_AM3517EVM=y
+CONFIG_SND_OMAP_SOC_DMIC=y
+CONFIG_SND_OMAP_SOC_HDMI=y
CONFIG_SND_OMAP_SOC_IGEP0020=y
CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_MCPDM=y
CONFIG_SND_OMAP_SOC_OMAP3EVM=y
CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=y
-# CONFIG_SND_OMAP_SOC_OMAP4_HDMI is not set
+CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y
CONFIG_SND_OMAP_SOC_OVERO=y
# CONFIG_SND_OMAP_SOC_RX51 is not set
CONFIG_SND_OMAP_SOC_SDP3430=y
-# CONFIG_SND_OMAP_SOC_SDP4430 is not set
+CONFIG_SND_OMAP_SOC_SDP4430=y
CONFIG_SND_OMAP_SOC_ZOOM2=y
# CONFIG_SND_OPL3_LIB_SEQ is not set
# CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -1775,9 +1780,11 @@ CONFIG_SND_RAWMIDI=m
CONFIG_SND_SOC=y
# CONFIG_SND_SOC_ALL_CODECS is not set
# CONFIG_SND_SOC_CACHE_LZO is not set
+CONFIG_SND_SOC_DMIC=y
CONFIG_SND_SOC_I2C_AND_SPI=y
CONFIG_SND_SOC_TLV320AIC23=y
CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_SOC_TWL6040=y
CONFIG_SND_SPI=y
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_TIMER=y
@@ -1933,7 +1940,7 @@ CONFIG_TWL4030_USB=y
CONFIG_TWL4030_WATCHDOG=y
# CONFIG_TWL6030_PWM is not set
CONFIG_TWL6030_USB=y
-# CONFIG_TWL6040_CORE is not set
+CONFIG_TWL6040_CORE=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set