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

Commit 92944c1c authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'mrst-touchscreen' into next 

Conflicts:
	drivers/input/touchscreen/Makefile
parents 77686517 d4f5f937

drivers/input/touchscreen/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -260,6 +260,18 @@ config TOUCHSCREEN_INEXIO 
	  To compile this driver as a module, choose M here: the

	  module will be called inexio.



config TOUCHSCREEN_INTEL_MID

	tristate "Intel MID platform resistive touchscreen"

	depends on INTEL_SCU_IPC

	help

	  Say Y here if you have a Intel MID based touchscreen in

	  your system.



	  If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called intel_mid_touch.



config TOUCHSCREEN_MK712

	tristate "ICS MicroClock MK712 touchscreen"

	help

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o 
obj-$(CONFIG_TOUCHSCREEN_ELO)		+= elo.o

obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o

obj-$(CONFIG_TOUCHSCREEN_INEXIO)	+= inexio.o

obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)	+= intel-mid-touch.o

obj-$(CONFIG_TOUCHSCREEN_LPC32XX)	+= lpc32xx_ts.o

obj-$(CONFIG_TOUCHSCREEN_MC13783)	+= mc13783_ts.o

obj-$(CONFIG_TOUCHSCREEN_MCS5000)	+= mcs5000_ts.o