From 9a25a3684e15951a570896f14936bd65e5b05d2f Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Fri, 19 Jul 2013 10:42:13 -0700 Subject: Revert "nitrogen6x: add OSS audio" This reverts commit 58532a1ba7dcc32a6663b439c3224cb5eb110ec3. --- arch/arm/configs/nitrogen6x_defconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm/configs/nitrogen6x_defconfig b/arch/arm/configs/nitrogen6x_defconfig index 513bb2c1a038..11e07292b2cc 100644 --- a/arch/arm/configs/nitrogen6x_defconfig +++ b/arch/arm/configs/nitrogen6x_defconfig @@ -178,14 +178,7 @@ CONFIG_FONT_8x16=y CONFIG_LOGO=y CONFIG_SOUND=y CONFIG_SND=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y -# CONFIG_SND_PCM_OSS_PLUGINS is not set -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_PCI is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set +CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_IMX_SGTL5000=y -- cgit v1.2.3