Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6aacf32 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: lahaina: enable QBT_HANDLER"

parents 40287648 7db2b2ff
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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
+1 −0
Original line number Diff line number Diff line
@@ -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
+3 −3
Original line number Diff line number Diff line
@@ -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) {