aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-05-16 17:07:15 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-05-16 17:24:42 +0200
commit8500885ce10c8be18c6e313b248c62aa093fd893 (patch)
treecb4415d3fc97d85045fc77bca045c2fc6d133b84
parent37af029d0aca96296b2493bb9edd79354bb381f3 (diff)
downloadopenembedded-8500885ce10c8be18c6e313b248c62aa093fd893.tar.gz
linux-nokia900-meego: remove oss and old alsa api
The removal of the oss api is needed: Without the removal some applications will try to use OSS (for instance intone) and will block the sound card for the other applications(for instance fsoaudiod's audio call handler, resulting in no sound during calls) Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--conf/machine/nokia900.conf2
-rw-r--r--recipes/linux/linux-nokia900-meego/defconfig13
2 files changed, 6 insertions, 9 deletions
diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
index 437362ba2e..7ea3c9c2fb 100644
--- a/conf/machine/nokia900.conf
+++ b/conf/machine/nokia900.conf
@@ -97,4 +97,4 @@ module_autoload_isp1704_charger = "isp1704_charger"
# Copied from include/omap3.inc (as we do not use linux-omap recipes):
#
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r61"
+MACHINE_KERNEL_PR = "r62"
diff --git a/recipes/linux/linux-nokia900-meego/defconfig b/recipes/linux/linux-nokia900-meego/defconfig
index 1015bbd830..4803c26bd6 100644
--- a/recipes/linux/linux-nokia900-meego/defconfig
+++ b/recipes/linux/linux-nokia900-meego/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.37 Kernel Configuration
-# Fri May 6 10:23:30 2011
+# Mon May 16 17:02:55 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1628,20 +1628,17 @@ CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
# CONFIG_LOGO is not set
CONFIG_SOUND=y
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
CONFIG_SND_JACK=y
# CONFIG_SND_SEQUENCER is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
# CONFIG_SND_HRTIMER is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
-CONFIG_SND_SUPPORT_OLD_API=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
# CONFIG_SND_DEBUG is not set