diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-27 03:27:10 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-27 03:27:10 -0400 |
| commit | 993808253ca256b8ca7f8ff90d9935d7c99cd32d (patch) | |
| tree | ff51c2b3f7625ae8d89b45962cc3dbc59a5152f8 /drivers/input/tablet/Kconfig | |
| parent | 10ce3cc919f50c2043b41ca968b43c26a3672600 (diff) | |
| parent | 131c713fd96e251fcb18f4d2d05f263aa41bb11f (diff) | |
Merge branch 'next' into for-linus
Conflicts:
drivers/input/tablet/wacom_sys.c
Diffstat (limited to 'drivers/input/tablet/Kconfig')
| -rw-r--r-- | drivers/input/tablet/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig index e53f4081a586..bed7cbf84cfd 100644 --- a/drivers/input/tablet/Kconfig +++ b/drivers/input/tablet/Kconfig | |||
| @@ -76,6 +76,7 @@ config TABLET_USB_KBTAB | |||
| 76 | config TABLET_USB_WACOM | 76 | config TABLET_USB_WACOM |
| 77 | tristate "Wacom Intuos/Graphire tablet support (USB)" | 77 | tristate "Wacom Intuos/Graphire tablet support (USB)" |
| 78 | depends on USB_ARCH_HAS_HCD | 78 | depends on USB_ARCH_HAS_HCD |
| 79 | select POWER_SUPPLY | ||
| 79 | select USB | 80 | select USB |
| 80 | select NEW_LEDS | 81 | select NEW_LEDS |
| 81 | select LEDS_CLASS | 82 | select LEDS_CLASS |