diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 17:26:15 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 17:26:15 +0400 |
| commit | fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 (patch) | |
| tree | 326d5f84b13938a12fb27468ef73db4faf43a44e /drivers/hid/Makefile | |
| parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) | |
| parent | 8c8b01c38a70661d663175d355fdea85ca082272 (diff) | |
| download | linux-fc73697bd5bf4efe8b5b2b78ec09e00f967cd055.tar.xz | |
Merge branch 'upstream' into for-linus
Conflicts:
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 987fa0627367..2ec042f57138 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -32,6 +32,7 @@ obj-$(CONFIG_HID_CHICONY) += hid-chicony.o obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o obj-$(CONFIG_HID_EGALAX) += hid-egalax.o +obj-$(CONFIG_HID_ELECOM) += hid-elecom.o obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o |