diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:49:32 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:49:32 -0400 |
| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a /drivers/hid/Makefile | |
| parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
| parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) | |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index ad74abcc73d5..62ab1383a99b 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -65,6 +65,7 @@ obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o | |||
| 65 | obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o | 65 | obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o |
| 66 | obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o | 66 | obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o |
| 67 | obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o | 67 | obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o |
| 68 | obj-$(CONFIG_HID_UCLOGIC) += hid-uclogic.o | ||
| 68 | obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o | 69 | obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o |
| 69 | obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o | 70 | obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o |
| 70 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o | 71 | obj-$(CONFIG_HID_WACOM) += hid-wacom.o |