diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-19 10:42:13 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-07-19 10:42:13 -0700 |
| commit | 9a25a3684e15951a570896f14936bd65e5b05d2f (patch) | |
| tree | a1243ff5fc7960f3781d5e84da525028bb86d211 | |
| parent | ebad167975b43fb316b1366b384bc3a56bd944e5 (diff) | |
Revert "nitrogen6x: add OSS audio"
This reverts commit 58532a1ba7dcc32a6663b439c3224cb5eb110ec3.
| -rw-r--r-- | arch/arm/configs/nitrogen6x_defconfig | 9 |
1 files changed, 1 insertions, 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 |