diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-04-23 17:52:33 +0200 |
---|---|---|
committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2019-04-23 17:52:33 +0200 |
commit | 7d3879bd5da4cc48f41443dcbfa46fcd72c5a354 (patch) | |
tree | 7fe5823076dff584878ff809217a42cc8c8d4428 /drivers/hid/intel-ish-hid/ipc/pci-ish.c | |
parent | HID: logitech-hidpp: change low battery level threshold from 31 to 30 percent (diff) | |
parent | HID: intel-ish-hid: Add Comet Lake PCI device ID (diff) | |
download | linux-dev-7d3879bd5da4cc48f41443dcbfa46fcd72c5a354.tar.xz linux-dev-7d3879bd5da4cc48f41443dcbfa46fcd72c5a354.zip |
Merge branch 'for-5.1/upstream-fixes' into for-5.2/logitech
Diffstat (limited to 'drivers/hid/intel-ish-hid/ipc/pci-ish.c')
-rw-r--r-- | drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c index a6e1ee744f4d..ac0a179daf23 100644 --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c @@ -40,6 +40,7 @@ static const struct pci_device_id ish_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)}, {0, } }; MODULE_DEVICE_TABLE(pci, ish_pci_tbl); |