diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:26:44 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:26:44 +0200 |
| commit | 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 (patch) | |
| tree | f05d0a426959ee01ce74c1f4733076d3b0ee4c8d /drivers/hid/Makefile | |
| parent | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (diff) | |
| parent | c872b0fccc6e086beea0a7b3b4123b7d0e75a868 (diff) | |
| download | op-kernel-dev-77933c354c6c0e4b6abcb417518e84b8fd9b7ae4.zip op-kernel-dev-77933c354c6c0e4b6abcb417518e84b8fd9b7ae4.tar.gz | |
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 ece32813..2e196c7 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_HID_CHERRY) += hid-cherry.o 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_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o |
