diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-14 00:43:34 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-14 00:43:34 +0300 |
| commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 (patch) | |
| tree | 3fd892aeae61b105e3c5c979550aabf54109a656 /drivers/hid/Makefile | |
| parent | 05f6d02521d4c7a656c5135d6d81c345ce531ac0 (diff) | |
| parent | b2eafd7282fdfd148fc09032540b0ff42bfedfbf (diff) | |
| download | linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.xz | |
Merge branch 'for-4.1/sensor-hub' into for-linus
Conflicts:
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
include/linux/hid-sensor-hub.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 9c399fe394fa..e4a21dfd7ef3 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -100,6 +100,7 @@ obj-$(CONFIG_HID_WACOM) += wacom.o obj-$(CONFIG_HID_WALTOP) += hid-waltop.o obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o obj-$(CONFIG_HID_SENSOR_HUB) += hid-sensor-hub.o +obj-$(CONFIG_HID_SENSOR_CUSTOM_SENSOR) += hid-sensor-custom.o obj-$(CONFIG_USB_HID) += usbhid/ obj-$(CONFIG_USB_MOUSE) += usbhid/ |