From patchwork Tue Nov 20 16:49:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: UBUNTU: [Config] SND_OMAP_SOC*=y Date: Tue, 20 Nov 2012 06:49:52 -0000 From: Paolo Pisati X-Patchwork-Id: 200403 Message-Id: <1353430192-30118-2-git-send-email-paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com See also: BugLink: http://bugs.launchpad.net/bugs/1019321 or commit 028cb4a14bdf0364e2379cd9bfa918a5294bdea0 Author: Paolo Pisati Date: Thu Jul 5 17:22:07 2012 +0200 UBUNTU: [Config] SND_OMAP_SOC, SND_OMAP_SOC_MCBSP and SND_OMAP_SOC_OMAP3_BEAGLE =y in Q/master. Signed-off-by: Paolo Pisati --- debian.master/config/armhf/config.flavour.highbank | 1 + debian.master/config/armhf/config.flavour.omap | 1 + debian.master/config/config.common.ubuntu | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index f37662a..ae589ea 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -138,6 +138,7 @@ CONFIG_SND_COMPRESS_OFFLOAD=m CONFIG_SND_PCM=m CONFIG_SND_SOC=m CONFIG_SND_SOC_I2C_AND_SPI=m +CONFIG_SND_SOC_TWL4030=m CONFIG_SND_TIMER=m # CONFIG_SOLARIS_X86_PARTITION is not set CONFIG_SOUND=m diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 9b57316..4432741 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -138,6 +138,7 @@ CONFIG_SND_COMPRESS_OFFLOAD=y CONFIG_SND_PCM=y CONFIG_SND_SOC=y CONFIG_SND_SOC_I2C_AND_SPI=y +CONFIG_SND_SOC_TWL4030=y CONFIG_SND_TIMER=y CONFIG_SOLARIS_X86_PARTITION=y CONFIG_SOUND=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 29e3662..bfff00e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5113,9 +5113,9 @@ CONFIG_SND_MTPAV=m CONFIG_SND_MTS64=m CONFIG_SND_NM256=m CONFIG_SND_OMAP_SOC=y -CONFIG_SND_OMAP_SOC_MCBSP=m +CONFIG_SND_OMAP_SOC_MCBSP=y CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m -CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m +CONFIG_SND_OMAP_SOC_OMAP_TWL4030=y CONFIG_SND_OMAP_SOC_SDP3430=m # CONFIG_SND_OMAP_SOC_ZOOM2 is not set CONFIG_SND_OPL3SA2=m @@ -5209,7 +5209,6 @@ CONFIG_SND_SOC_TLV320AIC32X4=m CONFIG_SND_SOC_TLV320AIC3X=m CONFIG_SND_SOC_TLV320DAC33=m CONFIG_SND_SOC_TPA6130A2=m -CONFIG_SND_SOC_TWL4030=m CONFIG_SND_SOC_TWL6040=m CONFIG_SND_SOC_UDA134X=m CONFIG_SND_SOC_UDA1380=m