Commit d05e84e6 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: move USB touchscreens under drivers/input/touchscreen 



This will allow concentrating all input devices in one place
in {menu|x|q}config.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4104d13f

drivers/input/touchscreen/Kconfig

+57 −3
Original line number Diff line number Diff line 
#

# Mouse driver configuration

# Touchscreen driver configuration

#

menuconfig INPUT_TOUCHSCREEN

	bool "Touchscreens"
@@ -164,4 +164,58 @@ config TOUCHSCREEN_UCB1400 
	  To compile this driver as a module, choose M here: the

	  module will be called ucb1400_ts.



config TOUCHSCREEN_USB_COMPOSITE

	tristate "USB Touchscreen Driver"

	select USB

	help

	  USB Touchscreen driver for:

	  - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)

	  - PanJit TouchSet USB

	  - 3M MicroTouch USB (EX II series)

	  - ITM

	  - some other eTurboTouch

	  - Gunze AHL61

	  - DMC TSC-10/25



	  Have a look at <http://linux.chapter7.ch/touchkit/> for

	  a usage description and the required user-space stuff.



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

	  module will be called usbtouchscreen.



config TOUCHSCREEN_USB_EGALAX

	default y

	bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_PANJIT

	default y

	bool "PanJit device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_3M

	default y

	bool "3M/Microtouch EX II series device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_ITM

	default y

	bool "ITM device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_ETURBO

	default y

	bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_GUNZE

	default y

	bool "Gunze AHL61 device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



config TOUCHSCREEN_USB_DMC_TSC10

	default y

	bool "DMC TSC-10/25 device support" if EMBEDDED

	depends on TOUCHSCREEN_USB_COMPOSITE



endif

drivers/input/touchscreen/Makefile

+9 −8
Original line number Diff line number Diff line 
#

# Makefile for the mouse drivers.

# Makefile for the touchscreen drivers.

#



# Each configuration option enables a list of files.
@@ -12,6 +12,7 @@ obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o 
obj-$(CONFIG_TOUCHSCREEN_MTOUCH)	+= mtouch.o

obj-$(CONFIG_TOUCHSCREEN_MK712)		+= mk712.o

obj-$(CONFIG_TOUCHSCREEN_HP600)		+= hp680_ts_input.o

obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)	+= usbtouchscreen.o

obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)	+= penmount.o

obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o

obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o

drivers/usb/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ obj-$(CONFIG_USB_STORAGE) += storage/ 
obj-$(CONFIG_USB)		+= storage/



obj-$(CONFIG_USB_ATI_REMOTE)	+= input/

obj-$(CONFIG_USB_MTOUCH)	+= input/

obj-$(CONFIG_USB_POWERMATE)	+= input/

obj-$(CONFIG_USB_XPAD)		+= input/

drivers/usb/input/Kconfig

+0 −54
Original line number Diff line number Diff line
@@ -19,60 +19,6 @@ config USB_POWERMATE 
	  To compile this driver as a module, choose M here: the

	  module will be called powermate.



config USB_TOUCHSCREEN

	tristate "USB Touchscreen Driver"

	depends on USB && INPUT

	---help---

	  USB Touchscreen driver for:

	  - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)

	  - PanJit TouchSet USB

	  - 3M MicroTouch USB (EX II series)

	  - ITM

	  - some other eTurboTouch

	  - Gunze AHL61

	  - DMC TSC-10/25



	  Have a look at <http://linux.chapter7.ch/touchkit/> for

	  a usage description and the required user-space stuff.



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

	  module will be called usbtouchscreen.



config USB_TOUCHSCREEN_EGALAX

	default y

	bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_TOUCHSCREEN_PANJIT

	default y

	bool "PanJit device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_TOUCHSCREEN_3M

	default y

	bool "3M/Microtouch EX II series device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_TOUCHSCREEN_ITM

	default y

	bool "ITM device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_TOUCHSCREEN_ETURBO

	default y

	bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_TOUCHSCREEN_GUNZE

	default y

	bool "Gunze AHL61 device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_TOUCHSCREEN_DMC_TSC10

	default y

	bool "DMC TSC-10/25 device support" if EMBEDDED

	depends on USB_TOUCHSCREEN



config USB_YEALINK

	tristate "Yealink usb-p1k voip phone"

	depends on USB && INPUT && EXPERIMENTAL