diff options
| author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-03-18 09:27:54 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-03-21 12:05:51 -0400 |
| commit | a841b62c5d5f75ce3676fde755696d30cc8de99a (patch) | |
| tree | f88311bd7e6d5afdb3a8c4d8feee98d6399d2d24 /drivers/hid/Makefile | |
| parent | 043b403aede4a528ed99ceaf050f567f1283a23e (diff) | |
HID: hid-multitouch: migrate Cando dual touch panels to hid-multitouch
This patch merges hid-cando into the unified multitouch driver.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
Reviewed-by: Stéphane Chatty <chatty@enac.fr>
Reviewed-by: Henrik Rydberg <rydberg@euromail.se>
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 a13cb4e99fff..f8b90e4e4841 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -30,7 +30,6 @@ obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o | |||
| 30 | obj-$(CONFIG_HID_ACRUX) += hid-axff.o | 30 | obj-$(CONFIG_HID_ACRUX) += hid-axff.o |
| 31 | obj-$(CONFIG_HID_APPLE) += hid-apple.o | 31 | obj-$(CONFIG_HID_APPLE) += hid-apple.o |
| 32 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o | 32 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o |
| 33 | obj-$(CONFIG_HID_CANDO) += hid-cando.o | ||
| 34 | obj-$(CONFIG_HID_CHERRY) += hid-cherry.o | 33 | obj-$(CONFIG_HID_CHERRY) += hid-cherry.o |
| 35 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o | 34 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o |
| 36 | obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o | 35 | obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o |