diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 13:35:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-30 13:35:03 +1100 |
| commit | c650c766a09d3f2b0c9ed6440aacc5704e403208 (patch) | |
| tree | e9ac8eb8cca6bc62835a4f6e90b90f784e3173a9 /arch/arm/mach-davinci/board-dm365-evm.c | |
| parent | 721d5291b585fa2b5cebea0eb1ad3550a7a18f86 (diff) | |
| parent | eae4653e1d11676f3505ac8d0c80f73830a8f6a1 (diff) | |
Merge remote branch 'sound/for-next'
Diffstat (limited to 'arch/arm/mach-davinci/board-dm365-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm365-evm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index d15beceb632e..512174a874a1 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -604,7 +604,11 @@ static __init void dm365_evm_init(void) /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); +#ifdef CONFIG_SND_DM365_AIC3X_CODEC dm365_init_asp(&dm365_evm_snd_data); +#elif defined(CONFIG_SND_DM365_VOICE_CODEC) + dm365_init_vc(&dm365_evm_snd_data); +#endif dm365_init_rtc(); dm365_init_ks(&dm365evm_ks_data); |