aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-05-07 16:38:49 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-05-08 01:41:29 -0400
commitd05e84e6cb21cca16987813fd3c271ebaed4233d (patch)
tree791dfc4d1df50d522b5938c36f2915a89f6386c8 /drivers
parent4104d13fe0194736393d97c88ee045fb689c783b (diff)
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: Dmitry Torokhov <dtor@mail.ru> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/touchscreen/Kconfig60
-rw-r--r--drivers/input/touchscreen/Makefile17
-rw-r--r--drivers/input/touchscreen/usbtouchscreen.c (renamed from drivers/usb/input/usbtouchscreen.c)0
-rw-r--r--drivers/usb/Makefile1
-rw-r--r--drivers/usb/input/Kconfig54
-rw-r--r--drivers/usb/input/Makefile1
6 files changed, 66 insertions, 67 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 971618059a6f..5e640aeb03cd 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -1,5 +1,5 @@
1# 1#
2# Mouse driver configuration 2# Touchscreen driver configuration
3# 3#
4menuconfig INPUT_TOUCHSCREEN 4menuconfig INPUT_TOUCHSCREEN
5 bool "Touchscreens" 5 bool "Touchscreens"
@@ -44,9 +44,9 @@ config TOUCHSCREEN_BITSY
44config TOUCHSCREEN_CORGI 44config TOUCHSCREEN_CORGI
45 tristate "SharpSL (Corgi and Spitz series) touchscreen driver" 45 tristate "SharpSL (Corgi and Spitz series) touchscreen driver"
46 depends on PXA_SHARPSL 46 depends on PXA_SHARPSL
47 default y 47 default y
48 help 48 help
49 Say Y here to enable the driver for the touchscreen on the 49 Say Y here to enable the driver for the touchscreen on the
50 Sharp SL-C7xx and SL-Cxx00 series of PDAs. 50 Sharp SL-C7xx and SL-Cxx00 series of PDAs.
51 51
52 If unsure, say N. 52 If unsure, say N.
@@ -164,4 +164,58 @@ config TOUCHSCREEN_UCB1400
164 To compile this driver as a module, choose M here: the 164 To compile this driver as a module, choose M here: the
165 module will be called ucb1400_ts. 165 module will be called ucb1400_ts.
166 166
167config TOUCHSCREEN_USB_COMPOSITE
168 tristate "USB Touchscreen Driver"
169 select USB
170 help
171 USB Touchscreen driver for:
172 - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
173 - PanJit TouchSet USB
174 - 3M MicroTouch USB (EX II series)
175 - ITM
176 - some other eTurboTouch
177 - Gunze AHL61
178 - DMC TSC-10/25
179
180 Have a look at <http://linux.chapter7.ch/touchkit/> for
181 a usage description and the required user-space stuff.
182
183 To compile this driver as a module, choose M here: the
184 module will be called usbtouchscreen.
185
186config TOUCHSCREEN_USB_EGALAX
187 default y
188 bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
189 depends on TOUCHSCREEN_USB_COMPOSITE
190
191config TOUCHSCREEN_USB_PANJIT
192 default y
193 bool "PanJit device support" if EMBEDDED
194 depends on TOUCHSCREEN_USB_COMPOSITE
195
196config TOUCHSCREEN_USB_3M
197 default y
198 bool "3M/Microtouch EX II series device support" if EMBEDDED
199 depends on TOUCHSCREEN_USB_COMPOSITE
200
201config TOUCHSCREEN_USB_ITM
202 default y
203 bool "ITM device support" if EMBEDDED
204 depends on TOUCHSCREEN_USB_COMPOSITE
205
206config TOUCHSCREEN_USB_ETURBO
207 default y
208 bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
209 depends on TOUCHSCREEN_USB_COMPOSITE
210
211config TOUCHSCREEN_USB_GUNZE
212 default y
213 bool "Gunze AHL61 device support" if EMBEDDED
214 depends on TOUCHSCREEN_USB_COMPOSITE
215
216config TOUCHSCREEN_USB_DMC_TSC10
217 default y
218 bool "DMC TSC-10/25 device support" if EMBEDDED
219 depends on TOUCHSCREEN_USB_COMPOSITE
220
167endif 221endif
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 30e6e2217a15..2f86d6ad06d3 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -1,17 +1,18 @@
1# 1#
2# Makefile for the mouse drivers. 2# Makefile for the touchscreen drivers.
3# 3#
4 4
5# Each configuration option enables a list of files. 5# Each configuration option enables a list of files.
6 6
7obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o 7obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o
8obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o 8obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o
9obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o 9obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o
10obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o 10obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o
11obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o 11obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
12obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o 12obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o
13obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o 13obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o
14obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o 14obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o
15obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o
15obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o 16obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o
16obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o 17obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
17obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o 18obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index 8e18e6c64777..8e18e6c64777 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index f7865669de35..2b6caf674e4a 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_USB_STORAGE) += storage/
24obj-$(CONFIG_USB) += storage/ 24obj-$(CONFIG_USB) += storage/
25 25
26obj-$(CONFIG_USB_ATI_REMOTE) += input/ 26obj-$(CONFIG_USB_ATI_REMOTE) += input/
27obj-$(CONFIG_USB_MTOUCH) += input/
28obj-$(CONFIG_USB_POWERMATE) += input/ 27obj-$(CONFIG_USB_POWERMATE) += input/
29obj-$(CONFIG_USB_XPAD) += input/ 28obj-$(CONFIG_USB_XPAD) += input/
30 29
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 86cad900c659..68109a02b6cd 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -19,60 +19,6 @@ config USB_POWERMATE
19 To compile this driver as a module, choose M here: the 19 To compile this driver as a module, choose M here: the
20 module will be called powermate. 20 module will be called powermate.
21 21
22config USB_TOUCHSCREEN
23 tristate "USB Touchscreen Driver"
24 depends on USB && INPUT
25 ---help---
26 USB Touchscreen driver for:
27 - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
28 - PanJit TouchSet USB
29 - 3M MicroTouch USB (EX II series)
30 - ITM
31 - some other eTurboTouch
32 - Gunze AHL61
33 - DMC TSC-10/25
34
35 Have a look at <http://linux.chapter7.ch/touchkit/> for
36 a usage description and the required user-space stuff.
37
38 To compile this driver as a module, choose M here: the
39 module will be called usbtouchscreen.
40
41config USB_TOUCHSCREEN_EGALAX
42 default y
43 bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
44 depends on USB_TOUCHSCREEN
45
46config USB_TOUCHSCREEN_PANJIT
47 default y
48 bool "PanJit device support" if EMBEDDED
49 depends on USB_TOUCHSCREEN
50
51config USB_TOUCHSCREEN_3M
52 default y
53 bool "3M/Microtouch EX II series device support" if EMBEDDED
54 depends on USB_TOUCHSCREEN
55
56config USB_TOUCHSCREEN_ITM
57 default y
58 bool "ITM device support" if EMBEDDED
59 depends on USB_TOUCHSCREEN
60
61config USB_TOUCHSCREEN_ETURBO
62 default y
63 bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
64 depends on USB_TOUCHSCREEN
65
66config USB_TOUCHSCREEN_GUNZE
67 default y
68 bool "Gunze AHL61 device support" if EMBEDDED
69 depends on USB_TOUCHSCREEN
70
71config USB_TOUCHSCREEN_DMC_TSC10
72 default y
73 bool "DMC TSC-10/25 device support" if EMBEDDED
74 depends on USB_TOUCHSCREEN
75
76config USB_YEALINK 22config USB_YEALINK
77 tristate "Yealink usb-p1k voip phone" 23 tristate "Yealink usb-p1k voip phone"
78 depends on USB && INPUT && EXPERIMENTAL 24 depends on USB && INPUT && EXPERIMENTAL
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index a9e9b2fc5e72..c8b843ce167c 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -5,7 +5,6 @@
5obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o 5obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o
6obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o 6obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o
7obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o 7obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o
8obj-$(CONFIG_USB_TOUCHSCREEN) += usbtouchscreen.o
9obj-$(CONFIG_USB_POWERMATE) += powermate.o 8obj-$(CONFIG_USB_POWERMATE) += powermate.o
10obj-$(CONFIG_USB_YEALINK) += yealink.o 9obj-$(CONFIG_USB_YEALINK) += yealink.o
11obj-$(CONFIG_USB_XPAD) += xpad.o 10obj-$(CONFIG_USB_XPAD) += xpad.o