diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:26:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:26:44 -0400 |
| commit | 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 (patch) | |
| tree | f05d0a426959ee01ce74c1f4733076d3b0ee4c8d /drivers/hid/Makefile | |
| parent | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (diff) | |
| parent | c872b0fccc6e086beea0a7b3b4123b7d0e75a868 (diff) | |
Merge branch 'egalax' 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 ece32813586c..2e196c734d2a 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -31,6 +31,7 @@ obj-$(CONFIG_HID_CHERRY) += hid-cherry.o | |||
| 31 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o | 31 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o |
| 32 | obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o | 32 | obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o |
| 33 | obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o | 33 | obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o |
| 34 | obj-$(CONFIG_HID_EGALAX) += hid-egalax.o | ||
| 34 | obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o | 35 | obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o |
| 35 | obj-$(CONFIG_HID_GYRATION) += hid-gyration.o | 36 | obj-$(CONFIG_HID_GYRATION) += hid-gyration.o |
| 36 | obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o | 37 | obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o |