diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-08-11 23:24:46 -0700 |
| commit | 4aa31b4b61e4985e719352c329c3948d1932cb64 (patch) | |
| tree | 251d6d11d1e5c9c09adc3e0eb1715c56b2e16c95 /drivers/misc/mei/pci-me.c | |
| parent | Input: remove w90x900 touchscreen driver (diff) | |
| parent | Linux 5.3-rc4 (diff) | |
| download | linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.tar.xz linux-dev-4aa31b4b61e4985e719352c329c3948d1932cb64.zip | |
Merge tag 'v5.3-rc4' into next
Sync up with mainline to bring in device_property_count_u32 andother
newer APIs.
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 7a2b3545a7f9..57cb68f5cc64 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -98,6 +98,9 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)}, + /* required last entry */ {0, } }; |