Input: move USB tablets under drivers/input/tablet

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>

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"
 
 source "drivers/input/joystick/Kconfig"
 
+source "drivers/input/tablet/Kconfig"
+
 source "drivers/input/touchscreen/Kconfig"
 
 source "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
 obj-$(CONFIG_INPUT_KEYBOARD)    += keyboard/
 obj-$(CONFIG_INPUT_MOUSE)       += mouse/
 obj-$(CONFIG_INPUT_JOYSTICK)    += joystick/
+obj-$(CONFIG_INPUT_TABLET)      += tablet/
 obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
 obj-$(CONFIG_INPUT_MISC)        += misc/
 
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 @@
+#
+# Tablet driver configuration
+#
+menuconfig INPUT_TABLET
+        bool "Tablets"
+        help
+          Say Y here, and a list of supported tablets will be displayed.
+          This option doesn't affect the kernel.
+
+          If unsure, say Y.
+
+if INPUT_TABLET
+
+config TABLET_USB_ACECAD
+        tristate "Acecad Flair tablet support (USB)"
+        select USB
+        help
+          Say Y here if you want to use the USB version of the Acecad Flair
+          tablet.  Make sure to say Y to "Mouse support"
+          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
+          (CONFIG_INPUT_EVDEV) as well.
+
+          To compile this driver as a module, choose M here: the
+          module will be called acecad.
+
+config TABLET_USB_AIPTEK
+        tristate "Aiptek 6000U/8000U tablet support (USB)"
+        select USB
+        help
+          Say Y here if you want to use the USB version of the Aiptek 6000U
+          or Aiptek 8000U tablet.  Make sure to say Y to "Mouse support"
+          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
+          (CONFIG_INPUT_EVDEV) as well.
+
+          To compile this driver as a module, choose M here: the
+          module will be called aiptek.
+
+config TABLET_USB_GTCO
+        tristate "GTCO CalComp/InterWrite USB Support"
+        depends on USB && INPUT
+        help
+          Say Y here if you want to use the USB version of the GTCO
+          CalComp/InterWrite Tablet.  Make sure to say Y to "Mouse support"
+          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
+          (CONFIG_INPUT_EVDEV) as well.
+
+          To compile this driver as a module, choose M here: the
+          module will be called gtco.
+
+config TABLET_USB_KBTAB
+        tristate "KB Gear JamStudio tablet support (USB)"
+        select USB
+        help
+          Say Y here if you want to use the USB version of the KB Gear
+          JamStudio tablet.  Make sure to say Y to "Mouse support"
+          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
+          (CONFIG_INPUT_EVDEV) as well.
+
+          To compile this driver as a module, choose M here: the
+          module will be called kbtab.
+
+config TABLET_USB_WACOM
+        tristate "Wacom Intuos/Graphire tablet support (USB)"
+        select USB
+        help
+          Say Y here if you want to use the USB version of the Wacom Intuos
+          or Graphire tablet.  Make sure to say Y to "Mouse support"
+          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
+          (CONFIG_INPUT_EVDEV) as well.
+
+          To compile this driver as a module, choose M here: the
+          module will be called wacom.
+
+endif
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 @@
+#
+# Makefile for the tablet drivers
+#
+
+# Multipart objects.
+wacom-objs      := wacom_wac.o wacom_sys.o
+
+obj-$(CONFIG_TABLET_USB_ACECAD) += acecad.o
+obj-$(CONFIG_TABLET_USB_AIPTEK) += aiptek.o
+obj-$(CONFIG_TABLET_USB_GTCO)   += gtco.o
+obj-$(CONFIG_TABLET_USB_KBTAB)  += kbtab.o
+obj-$(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 @@
 /*
- * drivers/usb/input/wacom.h
+ * drivers/input/tablet/wacom.h
  *
  *  USB Wacom Graphire and Wacom Intuos tablet support
  *
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 @@
 /*
- * drivers/usb/input/wacom_sys.c
+ * drivers/input/tablet/wacom_sys.c
  *
  *  USB Wacom Graphire and Wacom Intuos tablet support - system specific code
  */
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 @@
 /*
- * drivers/usb/input/wacom_wac.c
+ * drivers/input/tablet/wacom_wac.c
  *
  *  USB Wacom Graphire and Wacom Intuos tablet support - Wacom specific code
  *
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 @@
 /*
- * drivers/usb/input/wacom_wac.h
+ * drivers/input/tablet/wacom_wac.h
  *
  * This program is free software; you can redistribute it and/or modify
  * 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/
 obj-$(CONFIG_USB_STORAGE)       += storage/
 obj-$(CONFIG_USB)               += storage/
 
-obj-$(CONFIG_USB_ACECAD)        += input/
-obj-$(CONFIG_USB_AIPTEK)        += input/
 obj-$(CONFIG_USB_ATI_REMOTE)    += input/
-obj-$(CONFIG_USB_KBTAB)         += input/
 obj-$(CONFIG_USB_MTOUCH)        += input/
 obj-$(CONFIG_USB_POWERMATE)     += input/
-obj-$(CONFIG_USB_WACOM)         += input/
 obj-$(CONFIG_USB_XPAD)          += input/
 
 obj-$(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 @@
 comment "USB Input Devices"
         depends on USB
 
-config USB_AIPTEK
-        tristate "Aiptek 6000U/8000U tablet support"
-        depends on USB && INPUT
-        help
-          Say Y here if you want to use the USB version of the Aiptek 6000U
-          or Aiptek 8000U tablet.  Make sure to say Y to "Mouse support"
-          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
-          (CONFIG_INPUT_EVDEV) as well.
-
-          To compile this driver as a module, choose M here: the
-          module will be called aiptek.
-
-config USB_WACOM
-        tristate "Wacom Intuos/Graphire tablet support"
-        depends on USB && INPUT
-        help
-          Say Y here if you want to use the USB version of the Wacom Intuos
-          or Graphire tablet.  Make sure to say Y to "Mouse support"
-          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
-          (CONFIG_INPUT_EVDEV) as well.
-
-          To compile this driver as a module, choose M here: the
-          module will be called wacom.
-
-config USB_ACECAD
-        tristate "Acecad Flair tablet support"
-        depends on USB && INPUT
-        help
-          Say Y here if you want to use the USB version of the Acecad Flair
-          tablet.  Make sure to say Y to "Mouse support"
-          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
-          (CONFIG_INPUT_EVDEV) as well.
-
-          To compile this driver as a module, choose M here: the
-          module will be called acecad.
-
-config USB_KBTAB
-        tristate "KB Gear JamStudio tablet support"
-        depends on USB && INPUT
-        help
-          Say Y here if you want to use the USB version of the KB Gear
-          JamStudio tablet.  Make sure to say Y to "Mouse support"
-          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
-          (CONFIG_INPUT_EVDEV) as well.
-
-          To compile this driver as a module, choose M here: the
-          module will be called kbtab.
-
 config USB_POWERMATE
         tristate "Griffin PowerMate and Contour Jog support"
         depends on USB && INPUT
@@ -211,15 +163,3 @@ config USB_APPLETOUCH
 
           To compile this driver as a module, choose M here: the
           module will be called appletouch.
-
-config USB_GTCO
-        tristate "GTCO CalComp/InterWrite USB Support"
-        depends on USB && INPUT
-        ---help---
-          Say Y here if you want to use the USB version of the GTCO
-          CalComp/InterWrite Tablet.  Make sure to say Y to "Mouse support"
-          (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
-          (CONFIG_INPUT_EVDEV) as well.
-
-          To compile this driver as a module, choose M here: the
-          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 @@
 # Makefile for the USB input drivers
 #
 
-# Multipart objects.
-wacom-objs      := wacom_wac.o wacom_sys.o
-
-obj-$(CONFIG_USB_AIPTEK)        += aiptek.o
 obj-$(CONFIG_USB_ATI_REMOTE)    += ati_remote.o
 obj-$(CONFIG_USB_ATI_REMOTE2)   += ati_remote2.o
-obj-$(CONFIG_USB_KBTAB)         += kbtab.o
 obj-$(CONFIG_USB_KEYSPAN_REMOTE)        += keyspan_remote.o
 obj-$(CONFIG_USB_TOUCHSCREEN)   += usbtouchscreen.o
 obj-$(CONFIG_USB_POWERMATE)     += powermate.o
-obj-$(CONFIG_USB_WACOM)         += wacom.o
-obj-$(CONFIG_USB_ACECAD)        += acecad.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
 obj-$(CONFIG_USB_XPAD)          += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)    += appletouch.o
-obj-$(CONFIG_USB_GTCO)          += gtco.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG