From b3da9048e1fc96b0b7991ad9b0392f5f93f93b01 Mon Sep 17 00:00:00 2001 From: wengjun1 Date: Fri, 17 Apr 2020 16:22:01 +0800 Subject: [PATCH] dlkm: Improve himax_0flash_mmi - continous - Since defining the same IC name could potentially lead to compilation failure, change the name of the relevant macro. - Also change this name in common to ensure consistency. Change-Id: If8f4b8ce790ae1f1a4ed8d610860670751f674b6 Signed-off-by: wengjun1 Reviewed-on: https://gerrit.mot.com/1536526 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Hujun Liao Reviewed-by: Dezhen Hou Submit-Approved: Jira Key --- drivers/input/touchscreen/himax_0flash_mmi/Android.mk | 2 +- drivers/input/touchscreen/himax_0flash_mmi/Kbuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/himax_0flash_mmi/Android.mk b/drivers/input/touchscreen/himax_0flash_mmi/Android.mk index 4aacf034b9a9..806dd1779762 100644 --- a/drivers/input/touchscreen/himax_0flash_mmi/Android.mk +++ b/drivers/input/touchscreen/himax_0flash_mmi/Android.mk @@ -27,7 +27,7 @@ ifeq ($(HIMAX_V2_MMI_HX83102D),true) endif ifeq ($(HIMAX_V2_MMI_HX83112F),true) - KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME=hx83112f + KERNEL_CFLAGS += CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F=hx83112f endif ifneq ($(BOARD_USES_PANEL_NOTIFICATIONS),) diff --git a/drivers/input/touchscreen/himax_0flash_mmi/Kbuild b/drivers/input/touchscreen/himax_0flash_mmi/Kbuild index 0192bcd80db0..7c09fc506e29 100644 --- a/drivers/input/touchscreen/himax_0flash_mmi/Kbuild +++ b/drivers/input/touchscreen/himax_0flash_mmi/Kbuild @@ -8,7 +8,7 @@ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_DEBUG \ EXTRA_CFLAGS += -DCONFIG_TOUCHSCREEN_HIMAX_INCELL EXTRA_CFLAGS += -DCONFIG_HMX_DB -ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME)),) +ifneq ($(filter hx83112f,$(CONFIG_INPUT_HIMAX_V2_MMI_IC_NAME_F)),) EXTRA_CFLAGS += -D__HIMAX_HX83112_MOD__ EXTRA_CFLAGS += -DHX_FIX_TOUCH_INFO EXTRA_CFLAGS += -DHX_112F_SET