diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-18 12:23:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-18 12:23:59 +0000 |
| commit | a7a850dba82498a1e050d8d153cae67ce0edb3b2 (patch) | |
| tree | f2b50444022ad27f407e087a820ae5ff248e0492 /arch/arm/mach-davinci | |
| parent | c5fd9e77be44360b4827069c59f524815517917b (diff) | |
| parent | 0f4967bc21de0bb9e107f9ad3ced852daf66acd2 (diff) | |
| download | talos-op-linux-a7a850dba82498a1e050d8d153cae67ce0edb3b2.tar.gz talos-op-linux-a7a850dba82498a1e050d8d153cae67ce0edb3b2.zip | |
Merge branch 'asoc-4.21' into asoc-next
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 8143756ff38b..09e439d4abf5 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -794,9 +794,9 @@ static __init void dm365_evm_init(void) /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); -#ifdef CONFIG_SND_DM365_AIC3X_CODEC +#ifdef CONFIG_SND_SOC_DM365_AIC3X_CODEC dm365_init_asp(); -#elif defined(CONFIG_SND_DM365_VOICE_CODEC) +#elif defined(CONFIG_SND_SOC_DM365_VOICE_CODEC) dm365_init_vc(); #endif dm365_init_rtc(); |
