diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
| commit | 7426ef52b42ebd54ba85133ffd29132e008a882c (patch) | |
| tree | 5232ca850065baf025e8d7384408b48b4b462c96 /drivers/hid/Makefile | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
| parent | a8ab5d58b0238b8199cc699b8dff7c5e1da24138 (diff) | |
| download | linux-7426ef52b42ebd54ba85133ffd29132e008a882c.tar.bz2 | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-wacom.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 0b2618f092ca..d1f1b448977d 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -54,6 +54,7 @@ obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o +obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o obj-$(CONFIG_HID_WACOM) += hid-wacom.o obj-$(CONFIG_USB_HID) += usbhid/ |