aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-05-19 08:26:44 -0400
committerJiri Kosina <jkosina@suse.cz>2010-05-19 08:26:44 -0400
commit77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 (patch)
treef05d0a426959ee01ce74c1f4733076d3b0ee4c8d /drivers/hid/Makefile
parent896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (diff)
parentc872b0fccc6e086beea0a7b3b4123b7d0e75a868 (diff)
Merge branch 'egalax' into for-linus
Conflicts: drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile1
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
31obj-$(CONFIG_HID_CHICONY) += hid-chicony.o 31obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
32obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o 32obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
33obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o 33obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o
34obj-$(CONFIG_HID_EGALAX) += hid-egalax.o
34obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o 35obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
35obj-$(CONFIG_HID_GYRATION) += hid-gyration.o 36obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
36obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o 37obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o