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.

diff --cc drivers/input/tablet/Kconfig
index a5121b09c63f5f44180dfb9c1e7de575cc1b35d0,cd9c79e0a11b075e56be84bb56fb537f5b4900c7..623bb9e0d5a41a291aeca39c6bc712bdf8d6c962
--- 1/drivers/input/tablet/Kconfig
--- 2/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@@ -73,30 -73,4 +73,14 @@@ config TABLET_USB_KBTA
          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
 +      help
 +        Say Y here if you want to use Wacom protocol 4 serial tablets.
 +        E.g. serial versions of the Cintiq, Graphire or Penpartner.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called wacom_serial4.
 +
  endif

diff --cc drivers/input/tablet/Makefile
index 4d9339fb3b6361f10d00f6f72153412ddd83316c,cc3bc17d5b08742ad63cb114c0e35e9fb331eac1..2e130101cf3c8c800634a8b486b9cf5b7362fb4a
--- 1/drivers/input/tablet/Makefile
--- 2/drivers/input/tablet/Makefile
+++ b/drivers/input/tablet/Makefile
@@@ -10,5 -8,3 +8,4 @@@ obj-$(CONFIG_TABLET_USB_AIPTEK) += aipt
  obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o
  obj-$(CONFIG_TABLET_USB_HANWANG) += hanwang.o
  obj-$(CONFIG_TABLET_USB_KBTAB)        += kbtab.o
- obj-$(CONFIG_TABLET_USB_WACOM)        += wacom.o
 +obj-$(CONFIG_TABLET_SERIAL_WACOM4) += wacom_serial4.o