HID: uclogic: merge hid-huion driver in hid-uclogic
authorNikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Tue, 3 Mar 2015 17:44:01 +0000 (12:44 -0500)
committerJiri Kosina <jkosina@suse.cz>
Tue, 3 Mar 2015 20:31:54 +0000 (21:31 +0100)
commit08177f40bd00cd5232c0508e92a62f69cad9467f
tree0f17f2501e5af4148508ff82af9d05868ed91bd5
parent70b69cfb88467988116c4863056495fa3615271a
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>
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-huion.c [deleted file]
drivers/hid/hid-uclogic.c