projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
pci_ids.h
diff --git
a/include/linux/pci_ids.h
b/include/linux/pci_ids.h
index 58aa8d78353f9d383a536b312598706012dd7191..2338e68398cb5d70fb7aa4d04e86119e2d6da609 100644
(file)
--- a/
include/linux/pci_ids.h
+++ b/
include/linux/pci_ids.h
@@
-2245,6
+2245,8
@@
#define PCI_VENDOR_ID_MORETON 0x15aa
#define PCI_DEVICE_ID_RASTEL_2PORT 0x2000
+#define PCI_VENDOR_ID_VMWARE 0x15ad
+
#define PCI_VENDOR_ID_ZOLTRIX 0x15b0
#define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0