summaryrefslogtreecommitdiff
path: root/drivers/misc/mei/pci-me.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-02 19:30:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-02 19:30:09 +0200
commit99097a214b0c15f7595ac8f2788662f3941c1992 (patch)
tree9e496a96ea36ccd9e97509878fadeecd671e28aa /drivers/misc/mei/pci-me.c
parentd4e34999a7571e0a8d43cec6a0f13ecf40d3b1e8 (diff)
parent089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff)
Merge 5.3-rc7 into char-misc-next
We need the fixes in here as well for testing and merges Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/pci-me.c')
-rw-r--r--drivers/misc/mei/pci-me.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 563ebd56c3e5..d5a92c6eadb3 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -98,6 +98,8 @@ 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_TGP_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)},