Merge branch 'uc-logic' into for-linus

Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 68a7e862068e..2685beebc8dc 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