projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10ce3cc 131c713)
Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 27 Mar 2012 07:27:10 +0000 (00:27 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 27 Mar 2012 07:27:10 +0000 (00:27 -0700)
Conflicts:
drivers/input/tablet/wacom_sys.c

1  2 
drivers/input/tablet/Kconfig patch | diff1 | diff2 | blob | history
drivers/input/tablet/wacom_wac.c patch | diff1 | diff2 | blob | history

diff --cc drivers/input/tablet/Kconfig
index e53f408,0edeb94..bed7cbf
--- 1/drivers/input/tablet/Kconfig
--- 2/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"
diff --cc drivers/input/tablet/wacom_wac.c
Simple merge
Domain: System / Uncategorized;