diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 20:49:32 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 20:49:32 (GMT) |
commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
tree | ff6e16818194aca66d8ea34f9765067b2a82020a /drivers/hid/Kconfig | |
parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) | |
download | linux-fsl-qoriq-8b66a16f25f819bb1f132f075c5c01a288776cf8.tar.xz |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 68a7e86..2685bee 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -176,6 +176,12 @@ config HID_KYE ---help--- Support for Kye/Genius Ergo Mouse. +config HID_UCLOGIC + tristate "UC-Logic" + depends on USB_HID + ---help--- + Support for UC-Logic tablets. + config HID_GYRATION tristate "Gyration remote control" depends on USB_HID |