diff --git a/[refs] b/[refs] index 2d2a9e4b19cc..8acc5e5ad822 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c5f873d1b8f841bd6e1b2c3eda8a81e58224803 +refs/heads/master: 6760235fa46763ddeef451be6f7e981422397316 diff --git a/trunk/sound/soc/davinci/Kconfig b/trunk/sound/soc/davinci/Kconfig index 6bbf001f6591..9e11a14d1b45 100644 --- a/trunk/sound/soc/davinci/Kconfig +++ b/trunk/sound/soc/davinci/Kconfig @@ -29,7 +29,6 @@ choice prompt "DM365 codec select" depends on SND_DAVINCI_SOC_EVM depends on MACH_DAVINCI_DM365_EVM - default SND_DM365_EXTERNAL_CODEC config SND_DM365_AIC3X_CODEC bool "Audio Codec - AIC3101"