Merge branch 'topic/asoc' into for-linus

[pandora-kernel.git] / arch / arm / mach-davinci / board-dm365-evm.c

diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index d15bece..e78d811 100644 (file)
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -22,6 +22,7 @@
 #include <linux/leds.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/slab.h>
 #include <linux/mtd/nand.h>
 #include <linux/input.h>
 #include <linux/spi/spi.h>
@@ -604,7 +605,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);