diff options
| author | Gary King <gking@nvidia.com> | 2010-02-17 16:31:39 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git-master-01.nvidia.com> | 2010-02-17 16:31:39 -0800 |
| commit | 598dbfdde0875075bcdade4e0c6f44db8043d43d (patch) | |
| tree | 9eec213a9f76b566c555529116dbc64e430ac537 /arch | |
| parent | 9cb51ec93dea3f85e2cd1d0bf24750e2835af5d2 (diff) | |
| parent | 89664389b33a8560bc194386d1a2123aa905616e (diff) | |
Merge "Removing audio codec dependency from ALSA SoC driver" into android-tegra-2.6.29
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra_whistler_gnu_linux_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig index 5cc64a754c29..3d4089539a36 100644 --- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29 -# Fri Feb 5 19:09:59 2010 +# Wed Feb 10 16:26:40 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1033,8 +1033,7 @@ CONFIG_SND_SOC=y CONFIG_TEGRA_SND_SOC=y CONFIG_TEGRA_PCM=y CONFIG_TEGRA_I2S=y -CONFIG_TEGRA_SND_WHISTLER=y -CONFIG_SND_SOC_WM8753=y +CONFIG_TEGRA_GENERIC_CODEC=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set # CONFIG_SOUND_PRIME is not set |