aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-20 06:00:43 -0400
committerTakashi Iwai <tiwai@suse.de>2010-05-20 06:00:43 -0400
commitd71f4cece4bd97d05592836202fc04ff2e7817e3 (patch)
tree6c877c7a938758b1323d9c97d46b9c536e618c69 /arch/arm/mach-davinci
parent19008bdacb9f7841166ebafe0aef361ee582ffbf (diff)
parentad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff)
Merge branch 'topic/asoc' into for-linus
Conflicts: sound/soc/codecs/ad1938.c
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/board-dm365-evm.c4
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 df4ab2105869..e78d8110b12e 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -605,7 +605,11 @@ static __init void dm365_evm_init(void)
605 /* maybe setup mmc1/etc ... _after_ mmc0 */ 605 /* maybe setup mmc1/etc ... _after_ mmc0 */
606 evm_init_cpld(); 606 evm_init_cpld();
607 607
608#ifdef CONFIG_SND_DM365_AIC3X_CODEC
608 dm365_init_asp(&dm365_evm_snd_data); 609 dm365_init_asp(&dm365_evm_snd_data);
610#elif defined(CONFIG_SND_DM365_VOICE_CODEC)
611 dm365_init_vc(&dm365_evm_snd_data);
612#endif
609 dm365_init_rtc(); 613 dm365_init_rtc();
610 dm365_init_ks(&dm365evm_ks_data); 614 dm365_init_ks(&dm365evm_ks_data);
611 615