diff options
author | Bjorn Helgaas | 2019-11-28 08:54:52 -0600 |
---|---|---|
committer | Bjorn Helgaas | 2019-11-28 08:54:52 -0600 |
commit | d8ddab63635d4b474a99424538001932884b55ae (patch) | |
tree | eab00b143a5ff48f7daf7d9f44a6749b3d006027 /include/linux | |
parent | 77471510559cdb60cd3dd4e93dca5bfe71b0f5c6 (diff) | |
parent | e3d023b8952b78b82b1f9c6d7b708680a99ea831 (diff) |
Merge branch 'remotes/lorenzo/pci/vmd'
- Add VMD bus 224-255 restriction decode (Jon Derrick)
- Add VMD 8086:9A0B device ID (Jon Derrick)
- Remove Keith from VMD maintainer list (Keith Busch)
* remotes/lorenzo/pci/vmd:
MAINTAINERS: Remove Keith from VMD maintainer
PCI: vmd: Add device id for VMD device 8086:9A0B
PCI: vmd: Add bus 224-255 restriction decode
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci_ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 21a572469a4e..2302d133af6f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -3006,6 +3006,7 @@ #define PCI_DEVICE_ID_INTEL_84460GX 0x84ea #define PCI_DEVICE_ID_INTEL_IXP4XX 0x8500 #define PCI_DEVICE_ID_INTEL_IXP2800 0x9004 +#define PCI_DEVICE_ID_INTEL_VMD_9A0B 0x9a0b #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 #define PCI_VENDOR_ID_SCALEMP 0x8686 |