Merge branch 'mrst-touchscreen' into next (92944c1c) · Commits · jan.koester / Linux

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

+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

+0 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

+0 −2

Original line number	Diff line number	Diff line
		@@ -141,8 +141,6 @@ source "drivers/staging/adis16255/Kconfig"

		source "drivers/staging/xgifb/Kconfig"

		source "drivers/staging/mrst-touchscreen/Kconfig"

		source "drivers/staging/msm/Kconfig"

		source "drivers/staging/lirc/Kconfig"

+0 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@ obj-$(CONFIG_CXT1E1) += cxt1e1/
		obj-$(CONFIG_TI_ST) += ti-st/
		obj-$(CONFIG_ADIS16255) += adis16255/
		obj-$(CONFIG_FB_XGI) += xgifb/
		obj-$(CONFIG_TOUCHSCREEN_MRSTOUCH) += mrst-touchscreen/
		obj-$(CONFIG_MSM_STAGING) += msm/
		obj-$(CONFIG_EASYCAP) += easycap/
		obj-$(CONFIG_SOLO6X10) += solo6x10/