On Feb 25 2015 or thereabouts, Nikolai Kondrashov wrote: > On 02/25/2015 02:05 AM, 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: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx> > >--- > > > >Changed from the original patch: > >- update Makefile, Kconfig accordingly > >- remove one extra pr_err when kzalloc failed (raised by checkpatch.pl) > > > > 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. > >- > > 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. > > I'm not sure this is worth changing. We'll need to at least add Yiynova and > Ugee here later, which we're likely to forget. Meanwhile, essentially, they're > UC-Logic underneath. Well, true, we will likely forget it. But on the other hand, we should be consistant with the current state of the kernel. Right now, Huion users can look for huion in the menuconfig and find something. We should not remove it :/ > > Apart from this (which can be left as is, IMHO): > > Reviewed-by: Nikolai Kondrashov <spbnick@xxxxxxxxx> Could I have your Signed-off-by here, it's mainly your patch, and so I kept your From. > > BTW, will you be submitting changes to digimend-kernel-drivers to align it > with what you're submitting upstream? Yep, as soon as the changes hit Jiri's tree (so they will end end in Linus' tree at some point), I'll sync the digimend-kernel-drivers. Cheers, Benjamin -- 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
