aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-11-21 08:37:17 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-21 08:47:42 -0700
commit427cff96ad1582e53ada7afb675b2090ab59549b (patch)
tree49907f8f62d5c5c22b0c18c34d182e6867673c62
parenta4dd74ef6cf768d7b0c97ee23f00be15670ba85d (diff)
downloadlinux-linaro-precise-427cff96ad1582e53ada7afb675b2090ab59549b.tar.gz
LINARO: CONFIG: Make sound configs built-in for vexpress
BugLink: https://bugs.launchpad.net/bugs/862626 Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/changelog2
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx516
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap6
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress6
-rw-r--r--debian.linaro/config/config.common.ubuntu6
5 files changed, 20 insertions, 6 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index b8eef575952..dff77b70324 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -5,6 +5,8 @@ linux-linaro (3.1.0-4.4) UNRELEASED; urgency=low
CHANGELOG: Use the insertchanges target to create the final log.
* Bump abi
+ * CONFIG: Make sound configs builtin in vexpress
+ LP: #862626
-- John Rigby <john.rigby@linaro.org> Mon, 21 Nov 2011 08:29:27 -0700
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 63e76ee11e4..57bc8399f8a 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -1,6 +1,7 @@
#
# Config options for config.flavour.linaro-mx51 automatically generated by splitconfig.pl
#
+CONFIG_AC97_BUS=m
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_VEXPRESS is not set
@@ -25,7 +26,12 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y
# CONFIG_MMC_UNSAFE_RESUME is not set
# CONFIG_MTD_ARM_INTEGRATOR is not set
CONFIG_NOP_USB_XCEIV=y
+CONFIG_SND=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_ARMAACI=m
# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_PCM=m
+CONFIG_SND_TIMER=m
# CONFIG_TWL4030_CORE is not set
CONFIG_USB_ARCH_HAS_EHCI=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 496248012ae..caa4791c14c 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -1,6 +1,7 @@
#
# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
#
+CONFIG_AC97_BUS=m
# CONFIG_ARCH_MXC is not set
CONFIG_ARCH_OMAP=y
# CONFIG_ARCH_VEXPRESS is not set
@@ -31,7 +32,12 @@ CONFIG_NOP_USB_XCEIV=y
CONFIG_NR_CPUS=2
CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
+CONFIG_SND=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_ARMAACI=m
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_PCM=m
+CONFIG_SND_TIMER=m
CONFIG_TWL4030_CORE=y
CONFIG_TWL6040_CORE=y
CONFIG_USB_ARCH_HAS_EHCI=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 096e61c184e..04be6344c18 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -1,6 +1,7 @@
#
# Config options for config.flavour.linaro-vexpress automatically generated by splitconfig.pl
#
+CONFIG_AC97_BUS=y
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_OMAP is not set
CONFIG_ARCH_VEXPRESS=y
@@ -31,7 +32,12 @@ CONFIG_MTD_ARM_INTEGRATOR=y
CONFIG_NR_CPUS=4
# CONFIG_PL310_ERRATA_588369 is not set
# CONFIG_PL310_ERRATA_727915 is not set
+CONFIG_SND=y
+CONFIG_SND_AC97_CODEC=y
+CONFIG_SND_ARMAACI=y
# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_PCM=y
+CONFIG_SND_TIMER=y
CONFIG_TWL4030_CORE=y
# CONFIG_TWL6040_CORE is not set
# CONFIG_USB_ARCH_HAS_EHCI is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 032c7857273..8cf385aebcf 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -2,7 +2,6 @@
# Common config options automatically generated by splitconfig.pl
#
# CONFIG_ABX500_CORE is not set
-CONFIG_AC97_BUS=m
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACORN_PARTITION is not set
# CONFIG_ADFS_FS is not set
@@ -1817,12 +1816,9 @@ CONFIG_SMSC911X=y
# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC_PHY=y
# CONFIG_SM_FTL is not set
-CONFIG_SND=m
-CONFIG_SND_AC97_CODEC=m
# CONFIG_SND_AC97_POWER_SAVE is not set
# CONFIG_SND_ALOOP is not set
CONFIG_SND_ARM=y
-CONFIG_SND_ARMAACI=m
CONFIG_SND_DEBUG=y
# CONFIG_SND_DEBUG_VERBOSE is not set
CONFIG_SND_DRIVERS=y
@@ -1852,7 +1848,6 @@ CONFIG_SND_OMAP_SOC_ZOOM2=m
# CONFIG_SND_OPL3_LIB_SEQ is not set
# CONFIG_SND_OPL4_LIB_SEQ is not set
CONFIG_SND_OSSEMUL=y
-CONFIG_SND_PCM=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_PCM_XRUN_DEBUG is not set
@@ -1870,7 +1865,6 @@ CONFIG_SND_SOC_TWL4030=m
CONFIG_SND_SOC_TWL6040=m
CONFIG_SND_SPI=y
CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_TIMER=m
CONFIG_SND_USB=y
# CONFIG_SND_USB_6FIRE is not set
CONFIG_SND_USB_AUDIO=m