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

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

Merge "input: touchscreen: nt36xxx: Fix Propagation"

parents 0249e580 6b33e5f7

drivers/input/touchscreen/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1330,4 +1330,6 @@ config TOUCHSCREEN_SYNAPTICS_DSX 


source "drivers/input/touchscreen/synaptics_dsx/Kconfig"



source "drivers/input/touchscreen/nt36xxx/Kconfig"



endif

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -114,3 +114,4 @@ obj-$(CONFIG_TOUCHSCREEN_ST) += st/ 
obj-$(CONFIG_TOUCHSCREEN_FTS)	+= focaltech_touch/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_TCM)	+= synaptics_tcm/

obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX) += synaptics_dsx/

obj-$(CONFIG_TOUCHSCREEN_NT36XXX)	+= nt36xxx/

drivers/input/touchscreen/nt36xxx/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -2,9 +2,8 @@ 
#

# Novatek NT36xxx touchscreen driver configuration

#

config TOUCHSCREEN_NT36xxx

config TOUCHSCREEN_NT36XXX

	bool "Novatek NT36xxx"

	default y

	help

	  Say Y here if you have a Novatek NT36xxx touchscreen connected

	  to your system.

drivers/input/touchscreen/nt36xxx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 


# Each configuration option enables a list of files.



obj-$(CONFIG_TOUCHSCREEN_NT36xxx) += nt36xxx.o nt36xxx_fw_update.o nt36xxx_ext_proc.o nt36xxx_mp_ctrlram.o
 
obj-$(CONFIG_TOUCHSCREEN_NT36XXX) += nt36xxx.o nt36xxx_fw_update.o nt36xxx_ext_proc.o nt36xxx_mp_ctrlram.o

drivers/input/touchscreen/nt36xxx/nt36xxx.c

+399 −320

File changed.

Preview size limit exceeded, changes collapsed.