41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
|
From 4d80590924550d0ee3fe470e027deea0ee43e6b6 Mon Sep 17 00:00:00 2001
|
||
|
From: Michal Kubecek <mkubecek@suse.cz>
|
||
|
Date: Tue, 18 Apr 2017 12:52:08 +0200
|
||
|
Subject: [PATCH 1/6] vmnet: use standard definition of PCI_VENDOR_ID_VMWARE if
|
||
|
available
|
||
|
|
||
|
The PCI_VENDOR_ID_VMWARE macro is defined in mainline pci_ids.h since
|
||
|
commit 94e57fea6202 ("PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h")
|
||
|
in v3.18-rc1.
|
||
|
---
|
||
|
vmnet-only/vm_device_version.h | 5 +++++
|
||
|
1 file changed, 5 insertions(+)
|
||
|
|
||
|
diff --git a/vmnet-only/vm_device_version.h b/vmnet-only/vm_device_version.h
|
||
|
index ab396bc..cafddd0 100644
|
||
|
--- a/vmnet-only/vm_device_version.h
|
||
|
+++ b/vmnet-only/vm_device_version.h
|
||
|
@@ -35,6 +35,8 @@
|
||
|
#endif
|
||
|
#endif
|
||
|
|
||
|
+#include <linux/pci_ids.h>
|
||
|
+
|
||
|
/* LSILogic 53C1030 Parallel SCSI controller
|
||
|
* LSILogic SAS1068 SAS controller
|
||
|
*/
|
||
|
@@ -53,7 +55,10 @@
|
||
|
* VMware HD Audio codec
|
||
|
* VMware HD Audio controller
|
||
|
*/
|
||
|
+#ifndef PCI_VENDOR_ID_VMWARE
|
||
|
#define PCI_VENDOR_ID_VMWARE 0x15AD
|
||
|
+#endif
|
||
|
+
|
||
|
#define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
|
||
|
#define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
|
||
|
#define PCI_DEVICE_ID_VMWARE_VGA 0x0711
|
||
|
--
|
||
|
2.14.3
|
||
|
|