diff options
| author | Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com> | 2015-03-03 12:44:01 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-03-03 15:31:54 -0500 |
| commit | 08177f40bd00cd5232c0508e92a62f69cad9467f (patch) | |
| tree | 0f17f2501e5af4148508ff82af9d05868ed91bd5 /drivers/hid/Makefile | |
| parent | 70b69cfb88467988116c4863056495fa3615271a (diff) | |
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/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 6f19958dfc38..9c399fe394fa 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -41,7 +41,6 @@ obj-$(CONFIG_HID_GYRATION) += hid-gyration.o | |||
| 41 | obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o | 41 | obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o |
| 42 | obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o | 42 | obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o |
| 43 | obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o | 43 | obj-$(CONFIG_HID_HOLTEK) += hid-holtekff.o |
| 44 | obj-$(CONFIG_HID_HUION) += hid-huion.o | ||
| 45 | obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o | 44 | obj-$(CONFIG_HID_HYPERV_MOUSE) += hid-hyperv.o |
| 46 | obj-$(CONFIG_HID_ICADE) += hid-icade.o | 45 | obj-$(CONFIG_HID_ICADE) += hid-icade.o |
| 47 | obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o | 46 | obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o |