aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/input/Kconfig2
-rw-r--r--drivers/input/Makefile1
-rw-r--r--drivers/input/tablet/Kconfig74
-rw-r--r--drivers/input/tablet/Makefile12
-rw-r--r--drivers/input/tablet/acecad.c (renamed from drivers/usb/input/acecad.c)0
-rw-r--r--drivers/input/tablet/aiptek.c (renamed from drivers/usb/input/aiptek.c)0
-rw-r--r--drivers/input/tablet/gtco.c (renamed from drivers/usb/input/gtco.c)0
-rw-r--r--drivers/input/tablet/kbtab.c (renamed from drivers/usb/input/kbtab.c)0
-rw-r--r--drivers/input/tablet/wacom.h (renamed from drivers/usb/input/wacom.h)2
-rw-r--r--drivers/input/tablet/wacom_sys.c (renamed from drivers/usb/input/wacom_sys.c)2
-rw-r--r--drivers/input/tablet/wacom_wac.c (renamed from drivers/usb/input/wacom_wac.c)2
-rw-r--r--drivers/input/tablet/wacom_wac.h (renamed from drivers/usb/input/wacom_wac.h)2
-rw-r--r--drivers/usb/Makefile4
-rw-r--r--drivers/usb/input/Kconfig60
-rw-r--r--drivers/usb/input/Makefile8
15 files changed, 93 insertions, 76 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 96232313b1b9..0e9b69535ad6 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -153,6 +153,8 @@ source "drivers/input/mouse/Kconfig"
153 153
154source "drivers/input/joystick/Kconfig" 154source "drivers/input/joystick/Kconfig"
155 155
156source "drivers/input/tablet/Kconfig"
157
156source "drivers/input/touchscreen/Kconfig" 158source "drivers/input/touchscreen/Kconfig"
157 159
158source "drivers/input/misc/Kconfig" 160source "drivers/input/misc/Kconfig"
diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index b4cd10653c4f..8a2dd987546c 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_INPUT_EVBUG) += evbug.o
18obj-$(CONFIG_INPUT_KEYBOARD) += keyboard/ 18obj-$(CONFIG_INPUT_KEYBOARD) += keyboard/
19obj-$(CONFIG_INPUT_MOUSE) += mouse/ 19obj-$(CONFIG_INPUT_MOUSE) += mouse/
20obj-$(CONFIG_INPUT_JOYSTICK) += joystick/ 20obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
21obj-$(CONFIG_INPUT_TABLET) += tablet/
21obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/ 22obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
22obj-$(CONFIG_INPUT_MISC) += misc/ 23obj-$(CONFIG_INPUT_MISC) += misc/
23 24
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig
new file mode 100644
index 000000000000..12dfb0eb3262
--- /dev/null
+++ b/drivers/input/tablet/Kconfig
@@ -0,0 +1,74 @@
1#
2# Tablet driver configuration
3#
4menuconfig INPUT_TABLET
5 bool "Tablets"
6 help
7 Say Y here, and a list of supported tablets will be displayed.
8 This option doesn't affect the kernel.
9
10 If unsure, say Y.
11
12if INPUT_TABLET
13
14config TABLET_USB_ACECAD
15 tristate "Acecad Flair tablet support (USB)"
16 select USB
17 help
18 Say Y here if you want to use the USB version of the Acecad Flair
19 tablet. Make sure to say Y to "Mouse support"
20 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
21 (CONFIG_INPUT_EVDEV) as well.
22
23 To compile this driver as a module, choose M here: the
24 module will be called acecad.
25
26config TABLET_USB_AIPTEK
27 tristate "Aiptek 6000U/8000U tablet support (USB)"
28 select USB
29 help
30 Say Y here if you want to use the USB version of the Aiptek 6000U
31 or Aiptek 8000U tablet. Make sure to say Y to "Mouse support"
32 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
33 (CONFIG_INPUT_EVDEV) as well.
34
35 To compile this driver as a module, choose M here: the
36 module will be called aiptek.
37
38config TABLET_USB_GTCO
39 tristate "GTCO CalComp/InterWrite USB Support"
40 depends on USB && INPUT
41 help
42 Say Y here if you want to use the USB version of the GTCO
43 CalComp/InterWrite Tablet. Make sure to say Y to "Mouse support"
44 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
45 (CONFIG_INPUT_EVDEV) as well.
46
47 To compile this driver as a module, choose M here: the
48 module will be called gtco.
49
50config TABLET_USB_KBTAB
51 tristate "KB Gear JamStudio tablet support (USB)"
52 select USB
53 help
54 Say Y here if you want to use the USB version of the KB Gear
55 JamStudio tablet. Make sure to say Y to "Mouse support"
56 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
57 (CONFIG_INPUT_EVDEV) as well.
58
59 To compile this driver as a module, choose M here: the
60 module will be called kbtab.
61
62config TABLET_USB_WACOM
63 tristate "Wacom Intuos/Graphire tablet support (USB)"
64 select USB
65 help
66 Say Y here if you want to use the USB version of the Wacom Intuos
67 or Graphire tablet. Make sure to say Y to "Mouse support"
68 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
69 (CONFIG_INPUT_EVDEV) as well.
70
71 To compile this driver as a module, choose M here: the
72 module will be called wacom.
73
74endif
diff --git a/drivers/input/tablet/Makefile b/drivers/input/tablet/Makefile
new file mode 100644
index 000000000000..ce8b9a9cfa40
--- /dev/null
+++ b/drivers/input/tablet/Makefile
@@ -0,0 +1,12 @@
1#
2# Makefile for the tablet drivers
3#
4
5# Multipart objects.
6wacom-objs := wacom_wac.o wacom_sys.o
7
8obj-$(CONFIG_TABLET_USB_ACECAD) += acecad.o
9obj-$(CONFIG_TABLET_USB_AIPTEK) += aiptek.o
10obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o
11obj-$(CONFIG_TABLET_USB_KBTAB) += kbtab.o
12obj-$(CONFIG_TABLET_USB_WACOM) += wacom.o
diff --git a/drivers/usb/input/acecad.c b/drivers/input/tablet/acecad.c
index dd2310458c46..dd2310458c46 100644
--- a/drivers/usb/input/acecad.c
+++ b/drivers/input/tablet/acecad.c
diff --git a/drivers/usb/input/aiptek.c b/drivers/input/tablet/aiptek.c
index cc0a498763d8..cc0a498763d8 100644
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
diff --git a/drivers/usb/input/gtco.c b/drivers/input/tablet/gtco.c
index b2ca10f2fe0e..b2ca10f2fe0e 100644
--- a/drivers/usb/input/gtco.c
+++ b/drivers/input/tablet/gtco.c
diff --git a/drivers/usb/input/kbtab.c b/drivers/input/tablet/kbtab.c
index 91e6d00d4a43..91e6d00d4a43 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
diff --git a/drivers/usb/input/wacom.h b/drivers/input/tablet/wacom.h
index d85abfc5ab58..ef01a807ec0f 100644
--- a/drivers/usb/input/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/input/wacom.h 2 * drivers/input/tablet/wacom.h
3 * 3 *
4 * USB Wacom Graphire and Wacom Intuos tablet support 4 * USB Wacom Graphire and Wacom Intuos tablet support
5 * 5 *
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 1fe48208c2f4..83bddef66067 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/input/wacom_sys.c 2 * drivers/input/tablet/wacom_sys.c
3 * 3 *
4 * USB Wacom Graphire and Wacom Intuos tablet support - system specific code 4 * USB Wacom Graphire and Wacom Intuos tablet support - system specific code
5 */ 5 */
diff --git a/drivers/usb/input/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 4f3e9bc7177d..7661f03a2db2 100644
--- a/drivers/usb/input/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/input/wacom_wac.c 2 * drivers/input/tablet/wacom_wac.c
3 * 3 *
4 * USB Wacom Graphire and Wacom Intuos tablet support - Wacom specific code 4 * USB Wacom Graphire and Wacom Intuos tablet support - Wacom specific code
5 * 5 *
diff --git a/drivers/usb/input/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index 89793666ee8a..a5e12e8756de 100644
--- a/drivers/usb/input/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/input/wacom_wac.h 2 * drivers/input/tablet/wacom_wac.h
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index f5de58a63f2b..f7865669de35 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -23,13 +23,9 @@ obj-$(CONFIG_USB_PRINTER) += class/
23obj-$(CONFIG_USB_STORAGE) += storage/ 23obj-$(CONFIG_USB_STORAGE) += storage/
24obj-$(CONFIG_USB) += storage/ 24obj-$(CONFIG_USB) += storage/
25 25
26obj-$(CONFIG_USB_ACECAD) += input/
27obj-$(CONFIG_USB_AIPTEK) += input/
28obj-$(CONFIG_USB_ATI_REMOTE) += input/ 26obj-$(CONFIG_USB_ATI_REMOTE) += input/
29obj-$(CONFIG_USB_KBTAB) += input/
30obj-$(CONFIG_USB_MTOUCH) += input/ 27obj-$(CONFIG_USB_MTOUCH) += input/
31obj-$(CONFIG_USB_POWERMATE) += input/ 28obj-$(CONFIG_USB_POWERMATE) += input/
32obj-$(CONFIG_USB_WACOM) += input/
33obj-$(CONFIG_USB_XPAD) += input/ 29obj-$(CONFIG_USB_XPAD) += input/
34 30
35obj-$(CONFIG_USB_CATC) += net/ 31obj-$(CONFIG_USB_CATC) += net/
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index a792e42f58af..86cad900c659 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -4,54 +4,6 @@
4comment "USB Input Devices" 4comment "USB Input Devices"
5 depends on USB 5 depends on USB
6 6
7config USB_AIPTEK
8 tristate "Aiptek 6000U/8000U tablet support"
9 depends on USB && INPUT
10 help
11 Say Y here if you want to use the USB version of the Aiptek 6000U
12 or Aiptek 8000U tablet. Make sure to say Y to "Mouse support"
13 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
14 (CONFIG_INPUT_EVDEV) as well.
15
16 To compile this driver as a module, choose M here: the
17 module will be called aiptek.
18
19config USB_WACOM
20 tristate "Wacom Intuos/Graphire tablet support"
21 depends on USB && INPUT
22 help
23 Say Y here if you want to use the USB version of the Wacom Intuos
24 or Graphire tablet. Make sure to say Y to "Mouse support"
25 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
26 (CONFIG_INPUT_EVDEV) as well.
27
28 To compile this driver as a module, choose M here: the
29 module will be called wacom.
30
31config USB_ACECAD
32 tristate "Acecad Flair tablet support"
33 depends on USB && INPUT
34 help
35 Say Y here if you want to use the USB version of the Acecad Flair
36 tablet. Make sure to say Y to "Mouse support"
37 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
38 (CONFIG_INPUT_EVDEV) as well.
39
40 To compile this driver as a module, choose M here: the
41 module will be called acecad.
42
43config USB_KBTAB
44 tristate "KB Gear JamStudio tablet support"
45 depends on USB && INPUT
46 help
47 Say Y here if you want to use the USB version of the KB Gear
48 JamStudio tablet. Make sure to say Y to "Mouse support"
49 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
50 (CONFIG_INPUT_EVDEV) as well.
51
52 To compile this driver as a module, choose M here: the
53 module will be called kbtab.
54
55config USB_POWERMATE 7config USB_POWERMATE
56 tristate "Griffin PowerMate and Contour Jog support" 8 tristate "Griffin PowerMate and Contour Jog support"
57 depends on USB && INPUT 9 depends on USB && INPUT
@@ -211,15 +163,3 @@ config USB_APPLETOUCH
211 163
212 To compile this driver as a module, choose M here: the 164 To compile this driver as a module, choose M here: the
213 module will be called appletouch. 165 module will be called appletouch.
214
215config USB_GTCO
216 tristate "GTCO CalComp/InterWrite USB Support"
217 depends on USB && INPUT
218 ---help---
219 Say Y here if you want to use the USB version of the GTCO
220 CalComp/InterWrite Tablet. Make sure to say Y to "Mouse support"
221 (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
222 (CONFIG_INPUT_EVDEV) as well.
223
224 To compile this driver as a module, choose M here: the
225 module will be called gtco.
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index 284a0734e0cd..a9e9b2fc5e72 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -2,22 +2,14 @@
2# Makefile for the USB input drivers 2# Makefile for the USB input drivers
3# 3#
4 4
5# Multipart objects.
6wacom-objs := wacom_wac.o wacom_sys.o
7
8obj-$(CONFIG_USB_AIPTEK) += aiptek.o
9obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o 5obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o
10obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o 6obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o
11obj-$(CONFIG_USB_KBTAB) += kbtab.o
12obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o 7obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o
13obj-$(CONFIG_USB_TOUCHSCREEN) += usbtouchscreen.o 8obj-$(CONFIG_USB_TOUCHSCREEN) += usbtouchscreen.o
14obj-$(CONFIG_USB_POWERMATE) += powermate.o 9obj-$(CONFIG_USB_POWERMATE) += powermate.o
15obj-$(CONFIG_USB_WACOM) += wacom.o
16obj-$(CONFIG_USB_ACECAD) += acecad.o
17obj-$(CONFIG_USB_YEALINK) += yealink.o 10obj-$(CONFIG_USB_YEALINK) += yealink.o
18obj-$(CONFIG_USB_XPAD) += xpad.o 11obj-$(CONFIG_USB_XPAD) += xpad.o
19obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o 12obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o
20obj-$(CONFIG_USB_GTCO) += gtco.o
21 13
22ifeq ($(CONFIG_USB_DEBUG),y) 14ifeq ($(CONFIG_USB_DEBUG),y)
23EXTRA_CFLAGS += -DDEBUG 15EXTRA_CFLAGS += -DDEBUG
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-22 01:55:12 -0500