summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/configs/mpc85xx_defconfig
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2008-06-25 00:35:02 +0200
committerKumar Gala <galak@kernel.crashing.org>2008-07-17 00:59:48 +0200
commitac8a1014804c23c96e3f757145f73e1351c34365 (patch)
tree2289f244c156d5020b23233560ef3275f3090b10 /arch/powerpc/configs/mpc85xx_defconfig
parentRevert "powerpc/ep8248e: Fix compile problem if !CONFIG_FS_ENET" (diff)
downloadlinux-ac8a1014804c23c96e3f757145f73e1351c34365.tar.xz
linux-ac8a1014804c23c96e3f757145f73e1351c34365.zip
powerpc: fix ALSA options in Freescale 85xx and 86xx defconfigs
The defconfigs for Freescale 85xx and 86xx SOCs had bad choices for some audio related options. In particular, OSS emulation should be enabled, and the old ALSA API should be disabled. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_defconfig')
-rw-r--r--arch/powerpc/configs/mpc85xx_defconfig8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 3efab71a603b..fa0170504b88 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -1005,10 +1005,12 @@ CONFIG_SND=y
CONFIG_SND_TIMER=y
CONFIG_SND_PCM=y
# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
# 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