diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-11-18 22:48:42 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-18 22:48:42 +0100 |
commit | 125b58ed96491c4b81f617b73a4aa28f1c8637a9 (patch) | |
tree | b9678c96a65d3c06717c9e1d6ec85a4fbf62c3c6 /drivers/hid/Makefile | |
parent | 69f70bdd0608d90e4dd0bfaa8dcd2b07c11292b4 (diff) | |
parent | a45c30ec59342c47604ea074bcf56a43a8cde8aa (diff) |
Merge branch 'for-3.19/plantronics' into for-next
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 b102774b4e16..debd15b44b59 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -95,6 +95,7 @@ ifdef CONFIG_DEBUG_FS hid-picolcd-y += hid-picolcd_debugfs.o endif +obj-$(CONFIG_HID_PLANTRONICS) += hid-plantronics.o obj-$(CONFIG_HID_PRIMAX) += hid-primax.o obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \ hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \ |