From: Dmitry Torokhov Date: Tue, 27 Mar 2012 07:27:10 +0000 (-0700) Subject: Merge branch 'next' into for-linus X-Git-Tag: MMI-PSA29.97-13-9~8540^2~362 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=993808253ca256b8ca7f8ff90d9935d7c99cd32d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'next' into for-linus Conflicts: drivers/input/tablet/wacom_sys.c --- 993808253ca256b8ca7f8ff90d9935d7c99cd32d diff --cc drivers/input/tablet/Kconfig index e53f4081a586,0edeb949109b..bed7cbf84cfd --- a/drivers/input/tablet/Kconfig +++ b/drivers/input/tablet/Kconfig @@@ -76,9 -76,8 +76,10 @@@ config TABLET_USB_KBTA 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"