Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic...

[cascardo/linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index faf45fe..1590106 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -286,12 +286,6 @@ config HID_GT683R
        Currently the following devices are know to be supported:
          - MSI GT683R
 
-config HID_HUION
-       tristate "Huion tablets"
-       depends on USB_HID
-       ---help---
-       Support for Huion 580 tablet.
-
 config HID_KEYTOUCH
        tristate "Keytouch HID devices"
        depends on HID
@@ -312,9 +306,9 @@ config HID_KYE
 
 config HID_UCLOGIC
        tristate "UC-Logic"
-       depends on HID
+       depends on USB_HID
        ---help---
-       Support for UC-Logic tablets.
+       Support for UC-Logic and Huion tablets.
 
 config HID_WALTOP
        tristate "Waltop"
@@ -638,7 +632,6 @@ config HID_PICOLCD_CIR
 
 config HID_PLANTRONICS
        tristate "Plantronics USB HID Driver"
-       default !EXPERT
        depends on HID
        ---help---
        Provides HID support for Plantronics telephony devices.