diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 09:58:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 09:58:38 -0800 |
| commit | 8f685fbda43deccd130d192c9fcef1444649eaca (patch) | |
| tree | 976ed00423d03bdcaf11569a0c5c72ecb1c5c6c8 /drivers/hid/Makefile | |
| parent | d24450e2075b9ceeef8ad942e6391bc73eae6933 (diff) | |
| parent | 2d93666e70662cfcf1927e1a858685f5b38d5d65 (diff) | |
| download | linux-8f685fbda43deccd130d192c9fcef1444649eaca.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: hid-multitouch: minor fixes based on additional review
HID: Switch turbox/mosart touchscreen to hid-mosart
HID: add Add Cando touch screen 10.1-inch product id
HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger'
HID: hid-multitouch: add support for Cypress TrueTouch panels
HID: hid-multitouch: support for PixCir-based panels
HID: set HID_MAX_FIELD at 128
HID: add feature_mapping callback
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 6eae9a90b8dd..6efc2a0370ad 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o obj-$(CONFIG_HID_MOSART) += hid-mosart.o +obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o obj-$(CONFIG_HID_ORTEK) += hid-ortek.o obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o |