diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:09:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:09:31 -0400 |
| commit | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (patch) | |
| tree | 42f625d04b9fbff4cb93968f18efd91601df15a5 /drivers/hid/Makefile | |
| parent | ef77ad5e67447b3744574c29b97da6677d6d3f18 (diff) | |
| parent | ba4d8abb31def963f49b7c239a8acce57fe1d1cc (diff) | |
Merge branch 'cando' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
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 d1f1b448977d..ece32813586c 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -26,6 +26,7 @@ obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o | |||
| 26 | obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o | 26 | obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o |
| 27 | obj-$(CONFIG_HID_APPLE) += hid-apple.o | 27 | obj-$(CONFIG_HID_APPLE) += hid-apple.o |
| 28 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o | 28 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o |
| 29 | obj-$(CONFIG_HID_CANDO) += hid-cando.o | ||
| 29 | obj-$(CONFIG_HID_CHERRY) += hid-cherry.o | 30 | obj-$(CONFIG_HID_CHERRY) += hid-cherry.o |
| 30 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o | 31 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o |
| 31 | obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o | 32 | obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o |