diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:34:28 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:34:28 +0200 |
commit | 4e7be68e8d0f7bb3c030cdfa442d298457197751 (patch) | |
tree | b5541a91b5f4742d6e2c13d92ffb101fc06f6452 /drivers/hid/i2c-hid/Makefile | |
parent | Merge branch 'for-4.20/google' into for-linus (diff) | |
parent | HID: i2c-hid: override HID descriptors for certain devices (diff) | |
download | linux-4e7be68e8d0f7bb3c030cdfa442d298457197751.tar.xz linux-4e7be68e8d0f7bb3c030cdfa442d298457197751.zip |
Merge branch 'for-4.20/i2c-hid' into for-linus
- general cleanups of hid-i2c driver
- SPIODEV device descriptor fixes
Diffstat (limited to 'drivers/hid/i2c-hid/Makefile')
-rw-r--r-- | drivers/hid/i2c-hid/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/i2c-hid/Makefile b/drivers/hid/i2c-hid/Makefile index 832d8f9aaba2..099e1ce2f234 100644 --- a/drivers/hid/i2c-hid/Makefile +++ b/drivers/hid/i2c-hid/Makefile @@ -3,3 +3,6 @@ # obj-$(CONFIG_I2C_HID) += i2c-hid.o + +i2c-hid-objs = i2c-hid-core.o +i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o |