Merge branch 'wacom' into next

Merge large update to Wacom driver, converting it from USB to a HID
driver and unifying wired and bluetooth support, from Benjamin
Tissoires.

1 files changed, 0 insertions, 16 deletions

diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig
index a5121b09c63f..623bb9e0d5a4 100644
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@ -73,22 +73,6 @@ config TABLET_USB_KBTAB
           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)"
-        depends on USB_ARCH_HAS_HCD
-        select POWER_SUPPLY
-        select USB
-        select NEW_LEDS
-        select LEDS_CLASS
-        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 TABLET_SERIAL_WACOM4
         tristate "Wacom protocol 4 serial tablet support"
         select SERIO