From b8bca73bb7ce138c010e52ada824d4aa4ae0f852 Mon Sep 17 00:00:00 2001 From: Konstantin Makariev Date: Sat, 27 Mar 2021 04:13:01 -0500 Subject: [PATCH] fixup! (CR) synaptics_mmi_class: banks cli bringup Update makefiles to avoid enabling mutually exclusive options Mot-CRs-fixed: (CR) Signed-off-by: Konstantin Makariev Change-Id: I3a6f8df5e2296bdf3f1bee11f1c0733a1b6f72d0 Reviewed-on: https://gerrit.mot.com/1911535 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Igor Kovalenko Submit-Approved: Jira Key --- drivers/input/touchscreen/synaptics_mmi_class/Android.mk | 9 ++++++++- drivers/input/touchscreen/synaptics_mmi_class/Kbuild | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/synaptics_mmi_class/Android.mk b/drivers/input/touchscreen/synaptics_mmi_class/Android.mk index f8fc60fdc389..f09ea0b387e4 100644 --- a/drivers/input/touchscreen/synaptics_mmi_class/Android.mk +++ b/drivers/input/touchscreen/synaptics_mmi_class/Android.mk @@ -1,8 +1,15 @@ DLKM_DIR := motorola/kernel/modules LOCAL_PATH := $(call my-dir) +ifneq (,$(findstring CONFIG_PANEL_NOTIFICATIONS,$(KERNEL_DEFCONFIG))) + ifneq ($(findstring touchscreen_mmi.ko,$(BOARD_VENDOR_KERNEL_MODULES)),) -KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_MMI=y + KERNEL_CFLAGS += CONFIG_INPUT_TOUCHSCREEN_MMI=y +endif + +ifeq ($(DRM_PANEL_NOTIFICATIONS),true) + KERNEL_CFLAGS += CONFIG_DRM_PANEL_NOTIFICATIONS=y +endif include $(CLEAR_VARS) LOCAL_MODULE := synaptics_mmi_class.ko diff --git a/drivers/input/touchscreen/synaptics_mmi_class/Kbuild b/drivers/input/touchscreen/synaptics_mmi_class/Kbuild index 4c32c22e156a..ec9af6a95e64 100644 --- a/drivers/input/touchscreen/synaptics_mmi_class/Kbuild +++ b/drivers/input/touchscreen/synaptics_mmi_class/Kbuild @@ -13,9 +13,6 @@ EXTRA_CFLAGS += -DCONFIG_INPUT_TOUCHSCREEN_MMI ifneq ($(filter m y, $(CONFIG_DRM_PANEL_NOTIFICATIONS)),) EXTRA_CFLAGS += -DCONFIG_DRM_PANEL_NOTIFICATIONS endif -ifneq ($(filter m y, $(CONFIG_PANEL_NOTIFICATIONS)),) - EXTRA_CFLAGS += -DCONFIG_PANEL_NOTIFICATIONS -endif KBUILD_EXTRA_SYMBOLS += \ $(CURDIR)/$(KBUILD_EXTMOD)/../touchscreen_mmi/$(GKI_OBJ_MODULE_DIR)/Module.symvers \