diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 5c3ab88db9d5..4e353385a64e 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -30,6 +30,7 @@ CONFIG_MSM_GLOBAL_SYNX=y
 CONFIG_MSM_CVP=y
 CONFIG_ION_POOL_AUTO_REFILL=y
 CONFIG_HOTPLUG_SIZE_BITS=29
+CONFIG_MSM_QBT_HANDLER=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y
 CONFIG_MEMORY_HOTREMOVE=y
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index d8e6c0987570..5c4e6997067e 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -30,6 +30,7 @@ CONFIG_MSM_GENI_SE=y
 CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y
 CONFIG_QCOM_RTB=y
 CONFIG_QCOM_RTB_SEPARATE_CPUS=y
+CONFIG_MSM_QBT_HANDLER=y
 CONFIG_IPA_DEBUG=y
 CONFIG_IPA_UT=y
 CONFIG_MSM_ADSPRPC=y
diff --git a/drivers/soc/qcom/qbt_handler.c b/drivers/soc/qcom/qbt_handler.c
index f8157555687a..522c3c80b574 100644
--- a/drivers/soc/qcom/qbt_handler.c
+++ b/drivers/soc/qcom/qbt_handler.c
@@ -203,7 +203,7 @@ static int qfp_touch_event_notify(struct notifier_block *self,
 	return NOTIFY_OK;
 }
 
-struct notifier_block _input_event_notifier = {
+static struct notifier_block _input_event_notifier = {
 	.notifier_call = qfp_touch_event_notify,
 };
 
@@ -567,11 +567,11 @@ static ssize_t qbt_read(struct file *filp, char __user *ubuf,
 	return num_bytes;
 }
 
-static unsigned int qbt_poll(struct file *filp,
+static __poll_t qbt_poll(struct file *filp,
 	struct poll_table_struct *wait)
 {
 	struct qbt_drvdata *drvdata;
-	unsigned int mask = 0;
+	__poll_t mask = 0;
 	int minor_no = -1;
 
 	if (!filp || !filp->private_data) {