On Tue, 3 Mar 2015, Benjamin Tissoires wrote: > From: Nikolai Kondrashov <Nikolai.Kondrashov@xxxxxxxxxx> > > 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@xxxxxxxxxx> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx> > --- > > no changes in v3 > no changes in v2 > > drivers/hid/Kconfig | 8 +- > drivers/hid/Makefile | 1 - > drivers/hid/hid-huion.c | 290 ---------------------------------------------- > drivers/hid/hid-uclogic.c | 229 +++++++++++++++++++++++++++++++++++- > 4 files changed, 229 insertions(+), 299 deletions(-) > delete mode 100644 drivers/hid/hid-huion.c > > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > index 152b006..8a55fd7 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. > - The dependency on USB_HID was there actually on purpose, as the huion driver contained quite some USB-isms. Those now got merged to uclogic, but uclogic doesn't have USB_HID dependency. Could you guys please sort this out? Thanks, -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
