diff --git a/Android.mk b/Android.mk
index 0bdd72ca93..63889a2625 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,7 +7,7 @@ AUDIO_SELECT  := CONFIG_SND_SOC_WAIPIO=m
 endif
 
 # Build/Package only in case of supported target
-ifeq ($(call is-board-platform-in-list,taro), true)
+ifeq ($(call is-board-platform-in-list,taro kalama), true)
 
 LOCAL_PATH := $(call my-dir)
 
diff --git a/audio_kernel_vendor_board.mk b/audio_kernel_vendor_board.mk
index 65979f07df..be9ee81954 100644
--- a/audio_kernel_vendor_board.mk
+++ b/audio_kernel_vendor_board.mk
@@ -1,4 +1,5 @@
 # Build audio kernel driver
+ifneq ($(TARGET_USES_QMAA),true)
 ifneq ($(TARGET_BOARD_AUTO),true)
 ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true)
 BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
@@ -33,3 +34,4 @@ BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/q6_notifier_dlkm.ko\
 	$(KERNEL_MODULES_OUT)/hdmi_dlkm.ko
 endif
 endif
+endif