summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorNikolai Kondrashov <Nikolai.Kondrashov@redhat.com>2015-03-03 12:44:01 -0500
committerJiri Kosina <jkosina@suse.cz>2015-03-03 21:31:54 +0100
commit08177f40bd00cd5232c0508e92a62f69cad9467f (patch)
tree0f17f2501e5af4148508ff82af9d05868ed91bd5 /drivers/hid/Kconfig
parent70b69cfb88467988116c4863056495fa3615271a (diff)
downloadblackbird-op-linux-08177f40bd00cd5232c0508e92a62f69cad9467f.tar.gz
blackbird-op-linux-08177f40bd00cd5232c0508e92a62f69cad9467f.zip
HID: uclogic: merge hid-huion driver in hid-uclogic
Merge the hid-huion driver into hid-uclogic as all the devices supported by hid-huion are in fact UC-Logic devices. Signed-off-by: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 152b006833cd..8a55fd7f1fe3 100644
--- 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
@@ -314,7 +308,7 @@ config HID_UCLOGIC
tristate "UC-Logic"
depends on HID
---help---
- Support for UC-Logic tablets.
+ Support for UC-Logic and Huion tablets.
config HID_WALTOP
tristate "Waltop"
OpenPOWER on IntegriCloud